diff options
author | dgp <dgp@users.sourceforge.net> | 2014-01-24 22:33:30 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2014-01-24 22:33:30 (GMT) |
commit | d7803bcb41d1c10d401773c510f4624bb21312b7 (patch) | |
tree | d4d91eed124d65192b67f058bd7007237df5c3b8 /generic/tclIO.c | |
parent | e99699b00876c6e8699412433a7d97ac2529a28c (diff) | |
parent | 2ceb7a607771e46bc6889bb04b70d989c78e59ee (diff) | |
download | tcl-d7803bcb41d1c10d401773c510f4624bb21312b7.zip tcl-d7803bcb41d1c10d401773c510f4624bb21312b7.tar.gz tcl-d7803bcb41d1c10d401773c510f4624bb21312b7.tar.bz2 |
merge 8.5
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r-- | generic/tclIO.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 4a5d8f1..972cbd8 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -3787,16 +3787,17 @@ WriteChars( consumedSomething = 1; while (consumedSomething && (srcLen + savedLF + endEncoding > 0)) { consumedSomething = 0; - stage = statePtr->outputStage; - stageMax = statePtr->bufSize; - stageLen = stageMax; - - toWrite = stageLen; - if (toWrite > srcLen) { - toWrite = srcLen; - } if (translate) { + stage = statePtr->outputStage; + stageMax = statePtr->bufSize; + stageLen = stageMax; + + toWrite = stageLen; + if (toWrite > srcLen) { + toWrite = srcLen; + } + if (savedLF) { /* * A '\n' was left over from last call to TranslateOutputEOL() @@ -3822,8 +3823,9 @@ WriteChars( stageLen = stageMax; } } else { - memcpy(stage, src, toWrite); - stageLen = toWrite; + stage = (char *) src; + stageLen = srcLen; + toWrite = stageLen; } src += toWrite; srcLen -= toWrite; |