Merge 8.7, and fix the bug

5 files changed, 27 insertions, 27 deletions

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index dc37519..86c5a78 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -25,13 +25,13 @@ int
 char *
 \fBTcl_ExternalToUtfDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
-size_t
+int
 \fBTcl_ExternalToUtfDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
 .sp
 char *
 \fBTcl_UtfToExternalDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
-size_t
+int
 \fBTcl_UtfToExternalDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
 .sp
 int
@@ -220,7 +220,7 @@ used.  The return value is a pointer to the value stored in the DString.
 \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 (size_t)-1 if all is OK.
+Or TCL_INDEX_NONE if all is OK.
 .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
@@ -263,7 +263,7 @@ a pointer to the value stored in the DString.
 \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 (size_t)-1 if all is OK.
+conversion error. Or TCL_INDEX_NONE if all is OK.
 .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
diff --git a/generic/tcl.decls b/generic/tcl.decls
index a33ea56..3cf794e 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2437,11 +2437,11 @@ declare 657 {
     int Tcl_UniCharIsUnicode(int ch)
 }
 declare 658 {
-    size_t Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
+    int Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
 	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
 }
 declare 659 {
-    size_t Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
+    int Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
 	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
 }
 
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index c87bc46..401b14a 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -555,7 +555,7 @@ EncodingConvertfromObjCmd(
 #else
     int flags = TCL_ENCODING_NOCOMPLAIN;
 #endif
-    size_t result;
+    int result;
 
     if (objc == 2) {
 	encoding = Tcl_GetEncoding(interp, NULL);
@@ -600,11 +600,11 @@ encConvFromOK:
     }
     result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
 	    flags, &ds);
-    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != (size_t)-1)) {
+    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != TCL_INDEX_NONE)) {
 	char buf[TCL_INTEGER_SPACE];
-	sprintf(buf, "%" TCL_Z_MODIFIER "u", result);
+	sprintf(buf, "%u", result);
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-		TCL_Z_MODIFIER "u: '\\x%X'", result, UCHAR(bytesPtr[result])));
+		"u: '\\x%X'", result, UCHAR(bytesPtr[result])));
 	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
 		buf, NULL);
 	Tcl_DStringFree(&ds);
@@ -653,7 +653,7 @@ EncodingConverttoObjCmd(
     Tcl_Encoding encoding;	/* Encoding to use */
     int length;			/* Length of the string being converted */
     const char *stringPtr;	/* Pointer to the first byte of the string */
-    size_t result;
+    int result;
 #if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
     int flags = TCL_ENCODING_STOPONERROR;
 #else
@@ -696,14 +696,14 @@ encConvToOK:
     stringPtr = TclGetStringFromObj(data, &length);
     result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
 	    flags, &ds);
-    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != (size_t)-1)) {
-	size_t pos = Tcl_NumUtfChars(stringPtr, result);
+    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != TCL_INDEX_NONE)) {
+	int pos = Tcl_NumUtfChars(stringPtr, result);
 	int ucs4;
 	char buf[TCL_INTEGER_SPACE];
 	TclUtfToUCS4(&stringPtr[result], &ucs4);
-	sprintf(buf, "%" TCL_Z_MODIFIER "u", result);
+	sprintf(buf, "%u", result);
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected character at index %"
-		TCL_Z_MODIFIER "u: 'U+%06X'", pos, ucs4));
+		"u: 'U+%06X'", pos, ucs4));
 	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
 		buf, NULL);
 	Tcl_DStringFree(&ds);
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0830a11..57574b8 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1944,11 +1944,11 @@ EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
 /* 657 */
 EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 658 */
-EXTERN size_t		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
+EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
 				const char *src, int srcLen, int flags,
 				Tcl_DString *dsPtr);
 /* 659 */
-EXTERN size_t		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
+EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
 				const char *src, int srcLen, int flags,
 				Tcl_DString *dsPtr);
 /* 660 */
@@ -2656,8 +2656,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 */
-    size_t (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
-    size_t (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
+    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 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
     void (*reserved661)(void);
     void (*reserved662)(void);
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index b6d5dcf..fd0386c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1142,7 +1142,7 @@ Tcl_ExternalToUtfDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, 0, dstPtr);
+    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1176,7 +1176,7 @@ Tcl_ExternalToUtfDString(
  *-------------------------------------------------------------------------
  */
 
-size_t
+int
 Tcl_ExternalToUtfDStringEx(
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
@@ -1221,7 +1221,7 @@ Tcl_ExternalToUtfDStringEx(
 	src += srcRead;
 	if (result != TCL_CONVERT_NOSPACE) {
 	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return (result == TCL_OK) ? (size_t)-1 : (size_t)(src - srcStart);
+	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
 	}
 	flags &= ~TCL_ENCODING_START;
 	srcLen -= srcRead;
@@ -1380,7 +1380,7 @@ Tcl_UtfToExternalDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, 0, dstPtr);
+    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1415,7 +1415,7 @@ Tcl_UtfToExternalDString(
  *-------------------------------------------------------------------------
  */
 
-size_t
+int
 Tcl_UtfToExternalDStringEx(
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
@@ -1459,7 +1459,7 @@ Tcl_UtfToExternalDStringEx(
 	    while (i >= soFar) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
-	    return (result == TCL_OK) ? (size_t)-1 : (size_t)(src - srcStart);
+	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -2375,7 +2375,7 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
-		if (STOPONERROR) {
+		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
@@ -3156,7 +3156,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;
 	    }