summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-09-21 19:09:03 (GMT)
committerhobbs <hobbs>2001-09-21 19:09:03 (GMT)
commit18a951c0569d4182f8888aa6fa036d9853a6c02c (patch)
tree40c070fc14c587866e9895239523c8e24f1cbe45
parenta2ca8acedd3fd7649e2448632d71f4a10e00f6f9 (diff)
downloadtcl-18a951c0569d4182f8888aa6fa036d9853a6c02c.zip
tcl-18a951c0569d4182f8888aa6fa036d9853a6c02c.tar.gz
tcl-18a951c0569d4182f8888aa6fa036d9853a6c02c.tar.bz2
* generic/tclExecute.c (TclExecuteByteCode): corrected
INST_STR_CMP else case for strings to pass true utf char length to Tcl_UtfNCmp.
-rw-r--r--ChangeLog35
-rw-r--r--generic/tclExecute.c7
2 files changed, 41 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d4384bc..74a79e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+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
@@ -6,6 +25,22 @@
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
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index b189869..97a1da2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.33 2001/09/19 18:18:52 hobbs Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.34 2001/09/21 19:09:03 hobbs Exp $
*/
#include "tclInt.h"
@@ -2161,6 +2161,11 @@ TclExecuteByteCode(interp, codePtr)
*/
s1 = Tcl_GetStringFromObj(valuePtr, &s1len);
s2 = Tcl_GetStringFromObj(value2Ptr, &s2len);
+ /*
+ * These have to be in true chars
+ */
+ s1len = Tcl_NumUtfChars(s1, s1len);
+ s2len = Tcl_NumUtfChars(s2, s2len);
iResult = Tcl_UtfNcmp(s1, s2,
(size_t) ((s1len < s2len) ? s1len : s2len));
}