summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-05-16 15:05:08 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-05-16 15:05:08 (GMT)
commite2f62bb184b56cd2c6b21548153aee71b8d719a8 (patch)
tree77cdd0683d48082b253c28221385704f4d569ea8 /generic
parent40646ad79cd332a232c9d5afea6f879222e9ccb9 (diff)
parent42ba1ff27ede658e6f4b9d80c5c6c2734dcb39bf (diff)
downloadtcl-e2f62bb184b56cd2c6b21548153aee71b8d719a8.zip
tcl-e2f62bb184b56cd2c6b21548153aee71b8d719a8.tar.gz
tcl-e2f62bb184b56cd2c6b21548153aee71b8d719a8.tar.bz2
merge 8.5
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c46
1 files changed, 37 insertions, 9 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 3416b64..a5c77e8 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -5503,7 +5503,6 @@ ReadChars(
* record \r or \n yet.
*/
- assert(dstRead + 1 == dstDecoded);
assert(dst[dstRead] == '\r');
assert(statePtr->inputTranslation == TCL_TRANSLATE_CRLF);
@@ -5524,7 +5523,6 @@ ReadChars(
assert(dstWrote == 0);
assert(dstRead == 0);
- assert(dstDecoded == 1);
/*
* We decoded only the bare cr, and we cannot read a
@@ -5579,6 +5577,13 @@ ReadChars(
return 1;
}
+ /*
+ * Revise the dstRead value so that the numChars calc
+ * below correctly computes zero characters read.
+ */
+
+ dstRead = numChars;
+
/* FALL THROUGH - get more data (dstWrote == 0) */
}
@@ -5605,16 +5610,38 @@ ReadChars(
}
if (dstWrote == 0) {
+ ChannelBuffer *nextPtr;
- /*
- * We were not able to read any chars. Maybe there were
- * not enough src bytes to decode into a char. Maybe
- * a lone \r could not be translated (crlf mode). Need
- * to combine any unused src bytes we have in the first
- * buffer with subsequent bytes to try again.
+ /* We were not able to read any chars. */
+
+ assert (numChars == 0);
+
+ /*
+ * There is one situation where this is the correct final
+ * result. If the src buffer contains only a single \n
+ * byte, and we are in TCL_TRANSLATE_AUTO mode, and
+ * when the translation pass was made the INPUT_SAW_CR
+ * flag was set on the channel. In that case, the
+ * correct behavior is to consume that \n and produce the
+ * empty string.
+ */
+
+ if (dst[0] == '\n') {
+ assert(statePtr->inputTranslation == TCL_TRANSLATE_AUTO);
+ assert(dstRead == 1);
+
+ goto consume;
+ }
+
+ /* Otherwise, reading zero characters indicates there's
+ * something incomplete at the end of the src buffer.
+ * Maybe there were not enough src bytes to decode into
+ * a char. Maybe a lone \r could not be translated (crlf
+ * mode). Need to combine any unused src bytes we have
+ * in the first buffer with subsequent bytes to try again.
*/
- ChannelBuffer *nextPtr = bufPtr->nextPtr;
+ nextPtr = bufPtr->nextPtr;
if (nextPtr == NULL) {
if (srcLen > 0) {
@@ -5651,6 +5678,7 @@ ReadChars(
statePtr->inputEncodingFlags &= ~TCL_ENCODING_START;
+ consume:
bufPtr->nextRemoved += srcRead;
if (dstWrote > srcRead + 1) {
*factorPtr = dstWrote * UTF_EXPANSION_FACTOR / srcRead;