From 09531013443ef55893b05545dc67b5c5c304609e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Jan 2013 11:40:51 +0000
Subject: suggested fix for Bug 3092089: [file normalize] can remove path
 component, and for Bug 3587096: startup error message when exe in folder with
 junction with limited rights

---
 win/tclWinFile.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index a9b321d..a1da83f 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -709,6 +709,12 @@ NativeReadReparse(
 	    FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE) {
+	hFile = (*tclWinProcs->createFileProc)(linkDirPath, 0, 0,
+		NULL, OPEN_EXISTING,
+		FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    }
+
+    if (hFile == INVALID_HANDLE_VALUE) {
 	/*
 	 * Error creating directory.
 	 */
-- 
cgit v0.12


From 816ab7a3aa86fad4029569275897b1d8feb0f89d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Jan 2013 09:59:56 +0000
Subject: Don't call "ulimit" on cygwin: On Cygwin the stack size cannot be
 modified, and the reported stacksize is much lower than the real one.

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

diff --git a/tests/stack.test b/tests/stack.test
index e029bbd..44a960b 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -21,7 +21,8 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 # This doesn't catch all cases, for example threads of lower stacksize
 # can still squeak through.  A core check is really needed. -- JH
 
-if {[string equal $::tcl_platform(platform) "unix"]} {
+if {[string equal $::tcl_platform(platform) "unix"]
+	&& ![string equal $::tcl_platform(os) "Windows NT"]} {
     set stackSize [exec /bin/sh -c "ulimit -s"]
     if {[string is integer $stackSize] && ($stackSize < 2400)} {
         puts stderr "WARNING: the default application stacksize of $stackSize\
-- 
cgit v0.12


From 948149043162c4a2fa840e6c242e4bf31fe80dba Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Jan 2013 11:06:16 +0000
Subject: Extend the public and private stub tables with dummy NULL entries, up
 to the size of the Tcl 8.6 stub tables. This makes it easier to debug
 extensions which use Tcl 8.5/8.6 features but (erroneously) are attempted to
 be loaded in Tcl 8.4.

---
 ChangeLog             |   8 +++
 generic/tcl.decls     |   4 ++
 generic/tclDecls.h    | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++
 generic/tclInt.decls  |  35 ++++------
 generic/tclIntDecls.h | 155 +++++++++++++++++++++++++++++++++++++++++++
 generic/tclStubInit.c | 108 ++++++++++++++++++++++++++++++
 6 files changed, 465 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8eb7af6..a885b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-07  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tcl.decls: Extend the public and private stub tables with
+	* generic/tclInt.decls: dummy NULL entries, up to the size of the
+	Tcl 8.6 stub tables. This makes it easier to debug extensions which
+	use Tcl 8.5/8.6 features but (erroneously) are attempted to be loaded
+	in Tcl 8.4.
+
 2012-12-31  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/string.n: Noted the obsolescence of the 'bytelength',
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 19bacc3..b8d8d7d 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1795,6 +1795,10 @@ declare 573 {
 	    int objc, Tcl_Obj *const objv[], ClientData *clientDataPtr)
 }
 
+declare 630 {
+    void TclUnusedStubEntry(void)
+}
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 29b0eb0..7df9897 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1629,6 +1629,64 @@ EXTERN int		Tcl_PkgRequireProc _ANSI_ARGS_((Tcl_Interp *interp,
 				CONST char *name, int objc,
 				Tcl_Obj *CONST objv[],
 				ClientData *clientDataPtr));
+/* Slot 574 is reserved */
+/* Slot 575 is reserved */
+/* Slot 576 is reserved */
+/* Slot 577 is reserved */
+/* Slot 578 is reserved */
+/* Slot 579 is reserved */
+/* Slot 580 is reserved */
+/* Slot 581 is reserved */
+/* Slot 582 is reserved */
+/* Slot 583 is reserved */
+/* Slot 584 is reserved */
+/* Slot 585 is reserved */
+/* Slot 586 is reserved */
+/* Slot 587 is reserved */
+/* Slot 588 is reserved */
+/* Slot 589 is reserved */
+/* Slot 590 is reserved */
+/* Slot 591 is reserved */
+/* Slot 592 is reserved */
+/* Slot 593 is reserved */
+/* Slot 594 is reserved */
+/* Slot 595 is reserved */
+/* Slot 596 is reserved */
+/* Slot 597 is reserved */
+/* Slot 598 is reserved */
+/* Slot 599 is reserved */
+/* Slot 600 is reserved */
+/* Slot 601 is reserved */
+/* Slot 602 is reserved */
+/* Slot 603 is reserved */
+/* Slot 604 is reserved */
+/* Slot 605 is reserved */
+/* Slot 606 is reserved */
+/* Slot 607 is reserved */
+/* Slot 608 is reserved */
+/* Slot 609 is reserved */
+/* Slot 610 is reserved */
+/* Slot 611 is reserved */
+/* Slot 612 is reserved */
+/* Slot 613 is reserved */
+/* Slot 614 is reserved */
+/* Slot 615 is reserved */
+/* Slot 616 is reserved */
+/* Slot 617 is reserved */
+/* Slot 618 is reserved */
+/* Slot 619 is reserved */
+/* Slot 620 is reserved */
+/* Slot 621 is reserved */
+/* Slot 622 is reserved */
+/* Slot 623 is reserved */
+/* Slot 624 is reserved */
+/* Slot 625 is reserved */
+/* Slot 626 is reserved */
+/* Slot 627 is reserved */
+/* Slot 628 is reserved */
+/* Slot 629 is reserved */
+/* 630 */
+EXTERN void		TclUnusedStubEntry _ANSI_ARGS_((void));
 
 typedef struct TclStubHooks {
     struct TclPlatStubs *tclPlatStubs;
@@ -2238,6 +2296,63 @@ typedef struct TclStubs {
     VOID *reserved571;
     VOID *reserved572;
     int (*tcl_PkgRequireProc) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, int objc, Tcl_Obj *CONST objv[], ClientData *clientDataPtr)); /* 573 */
+    VOID *reserved574;
+    VOID *reserved575;
+    VOID *reserved576;
+    VOID *reserved577;
+    VOID *reserved578;
+    VOID *reserved579;
+    VOID *reserved580;
+    VOID *reserved581;
+    VOID *reserved582;
+    VOID *reserved583;
+    VOID *reserved584;
+    VOID *reserved585;
+    VOID *reserved586;
+    VOID *reserved587;
+    VOID *reserved588;
+    VOID *reserved589;
+    VOID *reserved590;
+    VOID *reserved591;
+    VOID *reserved592;
+    VOID *reserved593;
+    VOID *reserved594;
+    VOID *reserved595;
+    VOID *reserved596;
+    VOID *reserved597;
+    VOID *reserved598;
+    VOID *reserved599;
+    VOID *reserved600;
+    VOID *reserved601;
+    VOID *reserved602;
+    VOID *reserved603;
+    VOID *reserved604;
+    VOID *reserved605;
+    VOID *reserved606;
+    VOID *reserved607;
+    VOID *reserved608;
+    VOID *reserved609;
+    VOID *reserved610;
+    VOID *reserved611;
+    VOID *reserved612;
+    VOID *reserved613;
+    VOID *reserved614;
+    VOID *reserved615;
+    VOID *reserved616;
+    VOID *reserved617;
+    VOID *reserved618;
+    VOID *reserved619;
+    VOID *reserved620;
+    VOID *reserved621;
+    VOID *reserved622;
+    VOID *reserved623;
+    VOID *reserved624;
+    VOID *reserved625;
+    VOID *reserved626;
+    VOID *reserved627;
+    VOID *reserved628;
+    VOID *reserved629;
+    void (*tclUnusedStubEntry) _ANSI_ARGS_((void)); /* 630 */
 } TclStubs;
 
 #ifdef __cplusplus
@@ -4334,10 +4449,72 @@ extern TclStubs *tclStubsPtr;
 #define Tcl_PkgRequireProc \
 	(tclStubsPtr->tcl_PkgRequireProc) /* 573 */
 #endif
+/* Slot 574 is reserved */
+/* Slot 575 is reserved */
+/* Slot 576 is reserved */
+/* Slot 577 is reserved */
+/* Slot 578 is reserved */
+/* Slot 579 is reserved */
+/* Slot 580 is reserved */
+/* Slot 581 is reserved */
+/* Slot 582 is reserved */
+/* Slot 583 is reserved */
+/* Slot 584 is reserved */
+/* Slot 585 is reserved */
+/* Slot 586 is reserved */
+/* Slot 587 is reserved */
+/* Slot 588 is reserved */
+/* Slot 589 is reserved */
+/* Slot 590 is reserved */
+/* Slot 591 is reserved */
+/* Slot 592 is reserved */
+/* Slot 593 is reserved */
+/* Slot 594 is reserved */
+/* Slot 595 is reserved */
+/* Slot 596 is reserved */
+/* Slot 597 is reserved */
+/* Slot 598 is reserved */
+/* Slot 599 is reserved */
+/* Slot 600 is reserved */
+/* Slot 601 is reserved */
+/* Slot 602 is reserved */
+/* Slot 603 is reserved */
+/* Slot 604 is reserved */
+/* Slot 605 is reserved */
+/* Slot 606 is reserved */
+/* Slot 607 is reserved */
+/* Slot 608 is reserved */
+/* Slot 609 is reserved */
+/* Slot 610 is reserved */
+/* Slot 611 is reserved */
+/* Slot 612 is reserved */
+/* Slot 613 is reserved */
+/* Slot 614 is reserved */
+/* Slot 615 is reserved */
+/* Slot 616 is reserved */
+/* Slot 617 is reserved */
+/* Slot 618 is reserved */
+/* Slot 619 is reserved */
+/* Slot 620 is reserved */
+/* Slot 621 is reserved */
+/* Slot 622 is reserved */
+/* Slot 623 is reserved */
+/* Slot 624 is reserved */
+/* Slot 625 is reserved */
+/* Slot 626 is reserved */
+/* Slot 627 is reserved */
+/* Slot 628 is reserved */
+/* Slot 629 is reserved */
+#ifndef TclUnusedStubEntry
+#define TclUnusedStubEntry \
+	(tclStubsPtr->tclUnusedStubEntry) /* 630 */
+#endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
+#undef TclUnusedStubEntry
+
 #endif /* _TCLDECLS */
 
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index bdae099..18d1bdf 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -87,7 +87,7 @@ declare 14 {
 declare 16 {
     void TclExprFloatError(Tcl_Interp *interp, double value)
 }
-# Removed in 8.4
+# Removed in 8.4:
 #declare 17 {
 #    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 #}
@@ -531,19 +531,9 @@ declare 135 {
     int TclpCheckStackSpace(void)
 }
 
-# Added in 8.1:
-
-#declare 137 {
-#   int TclpChdir(const char *dirName)
-#}
 declare 138 {
     CONST84_RETURN char *TclGetEnv(const char *name, Tcl_DString *valuePtr)
 }
-#declare 139 {
-#    int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1,
-#	    char *sym2, Tcl_PackageInitProc **proc1Ptr,
-#	    Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr)
-#}
 declare 140 {
     int TclLooksLikeInt(const char *bytes, int length)
 }
@@ -579,7 +569,7 @@ declare 149 {
     void TclHandleRelease(TclHandle handle)
 }
 
-# Added for Tcl 8.2
+# Added in 8.2:
 
 declare 150 {
     int TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re)
@@ -595,7 +585,7 @@ declare 153 {
     Tcl_Obj *TclGetLibraryPath(void)
 }
 
-# moved to tclTest.c (static) in 8.3.2/8.4a2
+# moved to tclTest.c (static) in 8.3.2:
 #declare 154 {
 #    int TclTestChannelCmd(ClientData clientData,
 #    Tcl_Interp *interp, int argc, char **argv)
@@ -686,7 +676,7 @@ declare 172 {
     int TclInThreadExit(void)
 }
 
-# added for 8.4.2
+# Added in 8.4.2:
 
 declare 173 {
     int TclUniCharMatch(const Tcl_UniChar *string, int strLen,
@@ -706,6 +696,10 @@ declare 199 {
     int TclMatchIsTrivial(const char *pattern)
 }
 
+declare 249 {
+    void TclUnusedStubEntry(void)
+}
+
 ##############################################################################
 
 # Define the platform specific internal Tcl interface. These functions are
@@ -758,7 +752,7 @@ declare 9 win {
 declare 10 win {
     Tcl_DirEntry *TclpReaddir(DIR *dir)
 }
-# Removed in 8.3.1 (for Win32s only)
+# Removed in 8.3.1 (for Win32s only):
 #declare 10 win {
 #    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
 #}
@@ -807,7 +801,7 @@ declare 20 win {
 declare 21 win {
     char *TclpInetNtoa(struct in_addr addr)
 }
-# removed permanently for 8.4
+# Removed in 8.4:
 #declare 21 win {
 #    void TclpAsyncMark(Tcl_AsyncHandler async)
 #}
@@ -829,20 +823,17 @@ declare 26 win {
     void TclWinSetInterfaces(int wide)
 }
 
-# Added in Tcl 8.3.3 / 8.4
+# Added in 8.3.3:
 
 declare 27 win {
     void TclWinFlushDirtyChannels(void)
 }
 
-# Added in 8.4.2
+# Added in 8.4.2:
 
 declare 28 win {
     void TclWinResetInterfaces(void)
 }
-declare 29 win {
-    int TclWinCPUID(unsigned int index, unsigned int *regs)
-}
 
 ################################
 # Unix specific functions
@@ -903,7 +894,7 @@ declare 12 unix {
 declare 13 unix {
     char *TclpInetNtoa(struct in_addr addr)
 }
-declare 29 unix {
+declare 29 {win unix} {
     int TclWinCPUID(unsigned int index, unsigned int *regs)
 }
 
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 91db149..3bb9795 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -505,6 +505,57 @@ EXTERN struct tm *	TclpGmtime _ANSI_ARGS_((TclpTime_t_CONST clock));
 /* Slot 198 is reserved */
 /* 199 */
 EXTERN int		TclMatchIsTrivial _ANSI_ARGS_((CONST char *pattern));
+/* Slot 200 is reserved */
+/* Slot 201 is reserved */
+/* Slot 202 is reserved */
+/* Slot 203 is reserved */
+/* Slot 204 is reserved */
+/* Slot 205 is reserved */
+/* Slot 206 is reserved */
+/* Slot 207 is reserved */
+/* Slot 208 is reserved */
+/* Slot 209 is reserved */
+/* Slot 210 is reserved */
+/* Slot 211 is reserved */
+/* Slot 212 is reserved */
+/* Slot 213 is reserved */
+/* Slot 214 is reserved */
+/* Slot 215 is reserved */
+/* Slot 216 is reserved */
+/* Slot 217 is reserved */
+/* Slot 218 is reserved */
+/* Slot 219 is reserved */
+/* Slot 220 is reserved */
+/* Slot 221 is reserved */
+/* Slot 222 is reserved */
+/* Slot 223 is reserved */
+/* Slot 224 is reserved */
+/* Slot 225 is reserved */
+/* Slot 226 is reserved */
+/* Slot 227 is reserved */
+/* Slot 228 is reserved */
+/* Slot 229 is reserved */
+/* Slot 230 is reserved */
+/* Slot 231 is reserved */
+/* Slot 232 is reserved */
+/* Slot 233 is reserved */
+/* Slot 234 is reserved */
+/* Slot 235 is reserved */
+/* Slot 236 is reserved */
+/* Slot 237 is reserved */
+/* Slot 238 is reserved */
+/* Slot 239 is reserved */
+/* Slot 240 is reserved */
+/* Slot 241 is reserved */
+/* Slot 242 is reserved */
+/* Slot 243 is reserved */
+/* Slot 244 is reserved */
+/* Slot 245 is reserved */
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
+/* Slot 248 is reserved */
+/* 249 */
+EXTERN void		TclUnusedStubEntry _ANSI_ARGS_((void));
 
 typedef struct TclIntStubs {
     int magic;
@@ -710,6 +761,56 @@ typedef struct TclIntStubs {
     VOID *reserved197;
     VOID *reserved198;
     int (*tclMatchIsTrivial) _ANSI_ARGS_((CONST char *pattern)); /* 199 */
+    VOID *reserved200;
+    VOID *reserved201;
+    VOID *reserved202;
+    VOID *reserved203;
+    VOID *reserved204;
+    VOID *reserved205;
+    VOID *reserved206;
+    VOID *reserved207;
+    VOID *reserved208;
+    VOID *reserved209;
+    VOID *reserved210;
+    VOID *reserved211;
+    VOID *reserved212;
+    VOID *reserved213;
+    VOID *reserved214;
+    VOID *reserved215;
+    VOID *reserved216;
+    VOID *reserved217;
+    VOID *reserved218;
+    VOID *reserved219;
+    VOID *reserved220;
+    VOID *reserved221;
+    VOID *reserved222;
+    VOID *reserved223;
+    VOID *reserved224;
+    VOID *reserved225;
+    VOID *reserved226;
+    VOID *reserved227;
+    VOID *reserved228;
+    VOID *reserved229;
+    VOID *reserved230;
+    VOID *reserved231;
+    VOID *reserved232;
+    VOID *reserved233;
+    VOID *reserved234;
+    VOID *reserved235;
+    VOID *reserved236;
+    VOID *reserved237;
+    VOID *reserved238;
+    VOID *reserved239;
+    VOID *reserved240;
+    VOID *reserved241;
+    VOID *reserved242;
+    VOID *reserved243;
+    VOID *reserved244;
+    VOID *reserved245;
+    VOID *reserved246;
+    VOID *reserved247;
+    VOID *reserved248;
+    void (*tclUnusedStubEntry) _ANSI_ARGS_((void)); /* 249 */
 } TclIntStubs;
 
 #ifdef __cplusplus
@@ -1334,6 +1435,59 @@ extern TclIntStubs *tclIntStubsPtr;
 #define TclMatchIsTrivial \
 	(tclIntStubsPtr->tclMatchIsTrivial) /* 199 */
 #endif
+/* Slot 200 is reserved */
+/* Slot 201 is reserved */
+/* Slot 202 is reserved */
+/* Slot 203 is reserved */
+/* Slot 204 is reserved */
+/* Slot 205 is reserved */
+/* Slot 206 is reserved */
+/* Slot 207 is reserved */
+/* Slot 208 is reserved */
+/* Slot 209 is reserved */
+/* Slot 210 is reserved */
+/* Slot 211 is reserved */
+/* Slot 212 is reserved */
+/* Slot 213 is reserved */
+/* Slot 214 is reserved */
+/* Slot 215 is reserved */
+/* Slot 216 is reserved */
+/* Slot 217 is reserved */
+/* Slot 218 is reserved */
+/* Slot 219 is reserved */
+/* Slot 220 is reserved */
+/* Slot 221 is reserved */
+/* Slot 222 is reserved */
+/* Slot 223 is reserved */
+/* Slot 224 is reserved */
+/* Slot 225 is reserved */
+/* Slot 226 is reserved */
+/* Slot 227 is reserved */
+/* Slot 228 is reserved */
+/* Slot 229 is reserved */
+/* Slot 230 is reserved */
+/* Slot 231 is reserved */
+/* Slot 232 is reserved */
+/* Slot 233 is reserved */
+/* Slot 234 is reserved */
+/* Slot 235 is reserved */
+/* Slot 236 is reserved */
+/* Slot 237 is reserved */
+/* Slot 238 is reserved */
+/* Slot 239 is reserved */
+/* Slot 240 is reserved */
+/* Slot 241 is reserved */
+/* Slot 242 is reserved */
+/* Slot 243 is reserved */
+/* Slot 244 is reserved */
+/* Slot 245 is reserved */
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
+/* Slot 248 is reserved */
+#ifndef TclUnusedStubEntry
+#define TclUnusedStubEntry \
+	(tclIntStubsPtr->tclUnusedStubEntry) /* 249 */
+#endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
@@ -1344,5 +1498,6 @@ extern TclIntStubs *tclIntStubsPtr;
 #   undef TclSockMinimumBuffers
 #   define TclSockMinimumBuffers(a,b) TclSockMinimumBuffersOld((int)(a),b)
 #endif
+#undef TclUnusedStubEntry
 
 #endif /* _TCLINTDECLS */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index c601256..85dfe1c 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -33,6 +33,7 @@
 #undef Tcl_CreateHashEntry
 #undef TclpGetPid
 #undef TclSockMinimumBuffers
+#define TclUnusedStubEntry NULL
 
 /*
  * Keep a record of the original Notifier procedures, created in the
@@ -405,6 +406,56 @@ TclIntStubs tclIntStubs = {
     NULL, /* 197 */
     NULL, /* 198 */
     TclMatchIsTrivial, /* 199 */
+    NULL, /* 200 */
+    NULL, /* 201 */
+    NULL, /* 202 */
+    NULL, /* 203 */
+    NULL, /* 204 */
+    NULL, /* 205 */
+    NULL, /* 206 */
+    NULL, /* 207 */
+    NULL, /* 208 */
+    NULL, /* 209 */
+    NULL, /* 210 */
+    NULL, /* 211 */
+    NULL, /* 212 */
+    NULL, /* 213 */
+    NULL, /* 214 */
+    NULL, /* 215 */
+    NULL, /* 216 */
+    NULL, /* 217 */
+    NULL, /* 218 */
+    NULL, /* 219 */
+    NULL, /* 220 */
+    NULL, /* 221 */
+    NULL, /* 222 */
+    NULL, /* 223 */
+    NULL, /* 224 */
+    NULL, /* 225 */
+    NULL, /* 226 */
+    NULL, /* 227 */
+    NULL, /* 228 */
+    NULL, /* 229 */
+    NULL, /* 230 */
+    NULL, /* 231 */
+    NULL, /* 232 */
+    NULL, /* 233 */
+    NULL, /* 234 */
+    NULL, /* 235 */
+    NULL, /* 236 */
+    NULL, /* 237 */
+    NULL, /* 238 */
+    NULL, /* 239 */
+    NULL, /* 240 */
+    NULL, /* 241 */
+    NULL, /* 242 */
+    NULL, /* 243 */
+    NULL, /* 244 */
+    NULL, /* 245 */
+    NULL, /* 246 */
+    NULL, /* 247 */
+    NULL, /* 248 */
+    TclUnusedStubEntry, /* 249 */
 };
 
 TclIntPlatStubs tclIntPlatStubs = {
@@ -1128,6 +1179,63 @@ TclStubs tclStubs = {
     NULL, /* 571 */
     NULL, /* 572 */
     Tcl_PkgRequireProc, /* 573 */
+    NULL, /* 574 */
+    NULL, /* 575 */
+    NULL, /* 576 */
+    NULL, /* 577 */
+    NULL, /* 578 */
+    NULL, /* 579 */
+    NULL, /* 580 */
+    NULL, /* 581 */
+    NULL, /* 582 */
+    NULL, /* 583 */
+    NULL, /* 584 */
+    NULL, /* 585 */
+    NULL, /* 586 */
+    NULL, /* 587 */
+    NULL, /* 588 */
+    NULL, /* 589 */
+    NULL, /* 590 */
+    NULL, /* 591 */
+    NULL, /* 592 */
+    NULL, /* 593 */
+    NULL, /* 594 */
+    NULL, /* 595 */
+    NULL, /* 596 */
+    NULL, /* 597 */
+    NULL, /* 598 */
+    NULL, /* 599 */
+    NULL, /* 600 */
+    NULL, /* 601 */
+    NULL, /* 602 */
+    NULL, /* 603 */
+    NULL, /* 604 */
+    NULL, /* 605 */
+    NULL, /* 606 */
+    NULL, /* 607 */
+    NULL, /* 608 */
+    NULL, /* 609 */
+    NULL, /* 610 */
+    NULL, /* 611 */
+    NULL, /* 612 */
+    NULL, /* 613 */
+    NULL, /* 614 */
+    NULL, /* 615 */
+    NULL, /* 616 */
+    NULL, /* 617 */
+    NULL, /* 618 */
+    NULL, /* 619 */
+    NULL, /* 620 */
+    NULL, /* 621 */
+    NULL, /* 622 */
+    NULL, /* 623 */
+    NULL, /* 624 */
+    NULL, /* 625 */
+    NULL, /* 626 */
+    NULL, /* 627 */
+    NULL, /* 628 */
+    NULL, /* 629 */
+    TclUnusedStubEntry, /* 630 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From f6f2a3b144eb75edbc33ea0c15c40bc40e0158bd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Jan 2013 14:40:56 +0000
Subject: Restrict the stub library to only use 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.

---
 ChangeLog                   |  8 +++++
 generic/tclOOStubLib.c      | 72 ++++++++++++++++++---------------------------
 generic/tclTomMathStubLib.c | 32 +++++++-------------
 3 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c112ac3..801ce5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/generic/tclOOStubLib.c b/generic/tclOOStubLib.c
index 55f2378..921aced 100644
--- a/generic/tclOOStubLib.c
+++ b/generic/tclOOStubLib.c
@@ -2,19 +2,6 @@
  * ORIGINAL SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17
  */
 
-/*
- * We need to ensure that we use the tcl stub macros so that this file
- * contains no references to any of the tcl stub functions.
- */
-
-#undef USE_TCL_STUBS
-#define USE_TCL_STUBS
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define USE_TCLOO_STUBS 1
 #include "tclOOInt.h"
 
 MODULE_SCOPE const TclOOStubs *tclOOStubsPtr;
@@ -35,51 +22,48 @@ const TclOOIntStubs *tclOOIntStubsPtr = NULL;
  *	to indicate that an error occurred.
  *
  * Side effects:
- *	Sets the stub table pointer.
+ *	Sets the stub table pointers.
  *
  *----------------------------------------------------------------------
  */
 
 MODULE_SCOPE const char *
 TclOOInitializeStubs(
-    Tcl_Interp *interp, const char *version)
+    Tcl_Interp *interp,
+    const char *version)
 {
     int exact = 0;
     const char *packageName = "TclOO";
     const char *errMsg = NULL;
-    ClientData clientData = NULL;
-    const char *actualVersion =
-	    Tcl_PkgRequireEx(interp, packageName,version, exact, &clientData);
+    TclOOStubs *stubsPtr = NULL;
+    const char *actualVersion = tclStubsPtr->tcl_PkgRequireEx(interp,
+	    packageName, version, exact, &stubsPtr);
 
-    if (clientData == NULL) {
-	Tcl_ResetResult(interp);
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"error loading %s package; package not present or incomplete",
-		packageName));
+    if (actualVersion == NULL) {
 	return NULL;
+    }
+    if (stubsPtr == NULL) {
+	errMsg = "missing stub table pointer";
     } else {
-	const TclOOStubs * const stubsPtr = clientData;
-	const TclOOIntStubs * const intStubsPtr = stubsPtr->hooks ?
-		stubsPtr->hooks->tclOOIntStubs : NULL;
-
-	if (!actualVersion) {
-	    return NULL;
-	}
-
-	if (!stubsPtr || !intStubsPtr) {
-	    errMsg = "missing stub table pointer";
-	    goto error;
-	}
-
 	tclOOStubsPtr = stubsPtr;
-	tclOOIntStubsPtr = intStubsPtr;
+	if (stubsPtr->hooks) {
+	    tclOOIntStubsPtr = stubsPtr->hooks->tclOOIntStubs;
+	} else {
+	    tclOOIntStubsPtr = NULL;
+	}
 	return actualVersion;
-
-    error:
-	Tcl_ResetResult(interp);
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf("Error loading %s package"
-		" (requested version '%s', loaded version '%s'): %s",
-		packageName, version, actualVersion, errMsg));
-	return NULL;
     }
+    tclStubsPtr->tcl_ResetResult(interp);
+    tclStubsPtr->tcl_AppendResult(interp, "Error loading ", packageName,
+	    " (requested version ", version, ", actual version ",
+	    actualVersion, "): ", errMsg, NULL);
+    return NULL;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclTomMathStubLib.c b/generic/tclTomMathStubLib.c
index a3bc4b3..324f2a3 100644
--- a/generic/tclTomMathStubLib.c
+++ b/generic/tclTomMathStubLib.c
@@ -11,15 +11,6 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-/*
- * We need to ensure that we use the stub macros so that this file contains no
- * references to any of the stub functions. This will make it possible to
- * build an extension that references Tcl_InitStubs but doesn't end up
- * including the rest of the stub functions.
- */
-
-#define USE_TCL_STUBS
-
 #include "tclInt.h"
 
 MODULE_SCOPE const TclTomMathStubs *tclTomMathStubsPtr;
@@ -55,31 +46,30 @@ TclTomMathInitializeStubs(
     int exact = 0;
     const char *packageName = "tcl::tommath";
     const char *errMsg = NULL;
-    ClientData pkgClientData = NULL;
-    const char *actualVersion =
-	Tcl_PkgRequireEx(interp, packageName, version, exact, &pkgClientData);
-    const TclTomMathStubs *stubsPtr = pkgClientData;
+    TclTomMathStubs *stubsPtr = NULL;
+    const char *actualVersion = tclStubsPtr->tcl_PkgRequireEx(interp,
+	    packageName, version, exact, &stubsPtr);
 
     if (actualVersion == NULL) {
 	return NULL;
     }
-    if (pkgClientData == NULL) {
+    if (stubsPtr == NULL) {
 	errMsg = "missing stub table pointer";
-    } else if ((stubsPtr->tclBN_epoch)() != epoch) {
+    } else if(stubsPtr->tclBN_epoch() != epoch) {
 	errMsg = "epoch number mismatch";
-    } else if ((stubsPtr->tclBN_revision)() != revision) {
+    } else if(stubsPtr->tclBN_revision() != revision) {
 	errMsg = "requires a later revision";
     } else {
 	tclTomMathStubsPtr = stubsPtr;
 	return actualVersion;
     }
-
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "error loading %s (requested version %s, actual version %s): %s",
-	    packageName, version, actualVersion, errMsg));
+    tclStubsPtr->tcl_ResetResult(interp);
+    tclStubsPtr->tcl_AppendResult(interp, "Error loading ", packageName,
+	    " (requested version ", version, ", actual version ",
+	    actualVersion, "): ", errMsg, NULL);
     return NULL;
 }
-
+
 /*
  * Local Variables:
  * mode: c
-- 
cgit v0.12


From 5e04de18570772af42f7d32958d178bf85737430 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Jan 2013 08:08:28 +0000
Subject: mSys doesn't have $PWD. Reported by Rene Zaumseil on Tcl Core list

---
 win/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 39d34dd..9c57083 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -751,7 +751,7 @@ packages:
 	      if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
 	        ( cd $(PKG_DIR)/$$pkg; \
 	          echo "Configuring package '$$i' wd = `pwd -P`"; \
-	          $$i/configure --with-tcl=$(PWD) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
+	          $$i/configure --with-tcl=$(builddir) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
 	      fi ; \
 	      echo "Building package '$$pkg'"; \
 	      ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \
-- 
cgit v0.12


From 6eb9921283977c60251e6768c633fac4e6fbb4b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Jan 2013 08:44:33 +0000
Subject: new attempt for better fix

---
 win/tclWinFile.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index a1da83f..7da19ce 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -190,7 +190,7 @@ static unsigned short	NativeStatMode(DWORD attr, int checkLinks,
 			    int isExec);
 static int		NativeIsExec(const TCHAR *path);
 static int		NativeReadReparse(const TCHAR *LinkDirectory,
-			    REPARSE_DATA_BUFFER *buffer);
+			    REPARSE_DATA_BUFFER *buffer, DWORD desiredAccess);
 static int		NativeWriteReparse(const TCHAR *LinkDirectory,
 			    REPARSE_DATA_BUFFER *buffer);
 static int		NativeMatchType(int isDrive, DWORD attr,
@@ -481,7 +481,7 @@ TclWinSymLinkCopyDirectory(
     DUMMY_REPARSE_BUFFER dummy;
     REPARSE_DATA_BUFFER *reparseBuffer = (REPARSE_DATA_BUFFER *) &dummy;
 
-    if (NativeReadReparse(linkOrigPath, reparseBuffer)) {
+    if (NativeReadReparse(linkOrigPath, reparseBuffer, GENERIC_READ)) {
 	return -1;
     }
     return NativeWriteReparse(linkCopyPath, reparseBuffer);
@@ -580,7 +580,7 @@ WinReadLinkDirectory(
     if (!(attr & FILE_ATTRIBUTE_REPARSE_POINT)) {
 	goto invalidError;
     }
-    if (NativeReadReparse(linkDirPath, reparseBuffer)) {
+    if (NativeReadReparse(linkDirPath, reparseBuffer, 0)) {
 	return NULL;
     }
 
@@ -699,22 +699,17 @@ WinReadLinkDirectory(
 static int
 NativeReadReparse(
     const TCHAR *linkDirPath,	/* The junction to read */
-    REPARSE_DATA_BUFFER *buffer)/* Pointer to buffer. Cannot be NULL */
+    REPARSE_DATA_BUFFER *buffer,/* Pointer to buffer. Cannot be NULL */
+    DWORD desiredAccess)
 {
     HANDLE hFile;
     DWORD returnedLength;
 
-    hFile = (*tclWinProcs->createFileProc)(linkDirPath, GENERIC_READ, 0,
+    hFile = (*tclWinProcs->createFileProc)(linkDirPath, desiredAccess, 0,
 	    NULL, OPEN_EXISTING,
 	    FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE) {
-	hFile = (*tclWinProcs->createFileProc)(linkDirPath, 0, 0,
-		NULL, OPEN_EXISTING,
-		FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
-    }
-
-    if (hFile == INVALID_HANDLE_VALUE) {
 	/*
 	 * Error creating directory.
 	 */
-- 
cgit v0.12


From 0e6d90dd95ae50fb0c0d21372528bac15a3a9599 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Jan 2013 13:03:01 +0000
Subject: $builddir is a local variable

---
 win/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 9c57083..d0e14c6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -751,7 +751,7 @@ packages:
 	      if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
 	        ( cd $(PKG_DIR)/$$pkg; \
 	          echo "Configuring package '$$i' wd = `pwd -P`"; \
-	          $$i/configure --with-tcl=$(builddir) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
+	          $$i/configure --with-tcl=$$builddir --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
 	      fi ; \
 	      echo "Building package '$$pkg'"; \
 	      ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \
-- 
cgit v0.12


From c509f61617b25dc0e12c07ca27b5b44bce13cb5f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 9 Jan 2013 14:00:15 +0000
Subject: [Bug 3599395]: http assumes status line is a proper tcl list. Bump
 http package to 2.7.11.

---
 ChangeLog                 | 8 +++++++-
 library/http/http.tcl     | 4 ++--
 library/http/pkgIndex.tcl | 2 +-
 unix/Makefile.in          | 4 ++--
 win/Makefile.in           | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a025f9..e1373fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2013-01-09  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* library/http/http.tcl: [Bug 3599395]: http assumes status line
+	is a proper tcl list.
+	Bump http package to 2.7.11.
+
 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.
+	called via junction without folder list access.
 
 2013-01-07  Jan Nijtmans  <nijtmans@users.sf.net>
 
diff --git a/library/http/http.tcl b/library/http/http.tcl
index fa0425d..6b82894 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
 package require Tcl 8.4
 # Keep this in sync with pkgIndex.tcl and with the install directories in
 # Makefiles
-package provide http 2.7.10
+package provide http 2.7.11
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
@@ -974,7 +974,7 @@ proc http::Event {sock token} {
 	} elseif {$n == 0} {
 	    # We have now read all headers
 	    # We ignore HTTP/1.1 100 Continue returns. RFC2616 sec 8.2.3
-	    if {$state(http) == "" || [lindex $state(http) 1] == 100} {
+	    if {$state(http) == "" || ([regexp {^\S+\s(\d+)} $state(http) {} x] && $x == 100)} {
 		return
 	    }
 
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 0b5cdeb..73b2f36 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,4 +1,4 @@
 # Tcl package index file, version 1.1
 
 if {![package vsatisfies [package provide Tcl] 8.4]} {return}
-package ifneeded http 2.7.10 [list tclPkgSetup $dir http 2.7.10 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.7.11 [list tclPkgSetup $dir http 2.7.11 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e43c252..3daad96 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -766,8 +766,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
-	@echo "Installing package http 2.7.10 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
+	@echo "Installing package http 2.7.11 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 4949c70..23f5a2b 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -637,8 +637,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing package http 2.7.10 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.10.tm;
+	@echo "Installing package http 2.7.11 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.11.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
-- 
cgit v0.12