Merge 9.0. Further Makefile tweaks

ChangeLog

@@ -1382,7 +1382,7 @@ a better first place to look now.
 
 2012-05-03  Jan Nijtmans  <[email protected]>
 
-	* 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  <[email protected]>
@@ -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  <[email protected]>
 
 	* 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  <[email protected]>
@@ -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  <[email protected]>
 
@@ -8709,7 +8709,7 @@ a better first place to look now.
 2009-01-19  David Gravereaux  <[email protected]>
 
 	* 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

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

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  <[email protected]>
 
-	* 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 <[email protected]>
 
 	* 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  <[email protected]>
 
@@ -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  <[email protected]>

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  <[email protected]>
@@ -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.

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
@@ -2331,7 +2331,7 @@
 	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 accomodate the only behavior change: reporting of parse
+	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]
@@ -2571,7 +2571,7 @@
 2003-02-25  Don Porter	<[email protected]>
 
 	* doc/pkgMkIndex.n:	Modified [pkg_mkIndex] to use -nocase matching
-	* library/package.tcl:	of -load patterns, to better accomodate common
+	* library/package.tcl:	of -load patterns, to better accommodate common
 	user errors due to confusion between [package names] names and [info
 	loaded] names.
 

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

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.

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  <[email protected]>
 
@@ -2827,8 +2827,8 @@
 2007-03-24  Zoran Vasiljevic <[email protected]>
 
 	* 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  <[email protected]>
@@ -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	<[email protected]>
 
-	* 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  <[email protected]>

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  <[email protected]>
 
@@ -3252,7 +3252,7 @@
 2008-03-21  Donal K. Fellows  <[email protected]>
 
 	* 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]

changes

@@ -2486,7 +2486,7 @@ interpreter. (JL)
 installing and requesting security policies, purely in Tcl code. Overloads
 the package command to also allow an interpreter to "require" a policy. The
 following new library commands are provided:
-	tcl_safeCreateInterp	-- creates a slave an initializes the
+	tcl_safeCreateInterp	-- creates a slave and initializes the
 				   policy mechanism.
 	tcl_safeInitInterp	-- initializes an existing slave with the
 				   policy mechanism.
@@ -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)

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
 
 
@@ -365,7 +368,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 +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",dir.path,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);