diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-10-18 20:06:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-10-18 20:06:02 (GMT) |
| commit | 9b7178e0a6eba9d3895f2f34019e06eb80b25df0 (patch) | |
| tree | 23020581d5324f4af1753744de8a7facf5198ecb /generic | |
| parent | 73df1e04588ba22154d42e7eedee8f709d3e26fa (diff) | |
| parent | b15488bf6e8d9be3ad5143e3f97d952f33938a83 (diff) | |
| download | tcl-9b7178e0a6eba9d3895f2f34019e06eb80b25df0.zip tcl-9b7178e0a6eba9d3895f2f34019e06eb80b25df0.tar.gz tcl-9b7178e0a6eba9d3895f2f34019e06eb80b25df0.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIO.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index d1f22c1..0122ec9 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4042,6 +4042,7 @@ Tcl_GetsObj( eof = NULL; inEofChar = statePtr->inEofChar; + ResetFlag(statePtr, CHANNEL_BLOCKED); while (1) { if (dst >= dstEnd) { if (FilterInputBytes(chanPtr, &gs) != 0) { @@ -4386,6 +4387,7 @@ TclGetsObjBinary( /* Only handle TCL_TRANSLATE_LF and TCL_TRANSLATE_CR */ eolChar = (statePtr->inputTranslation == TCL_TRANSLATE_LF) ? '\n' : '\r'; + ResetFlag(statePtr, CHANNEL_BLOCKED); while (1) { /* * Subtract the number of bytes that were removed from channel @@ -4674,6 +4676,12 @@ FilterInputBytes( */ read: + if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_BLOCKED) + == (CHANNEL_NONBLOCKING|CHANNEL_BLOCKED)) { + gsPtr->charsWrote = 0; + gsPtr->rawRead = 0; + return -1; + } if (GetInput(chanPtr) != 0) { gsPtr->charsWrote = 0; gsPtr->rawRead = 0; @@ -4764,12 +4772,6 @@ FilterInputBytes( * some more, but avoid blocking on a non-blocking channel. */ - if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_BLOCKED) - == (CHANNEL_NONBLOCKING|CHANNEL_BLOCKED)) { - gsPtr->charsWrote = 0; - gsPtr->rawRead = 0; - return -1; - } goto read; } } else { |