summaryrefslogtreecommitdiffstats
path: root/generic/tclIO.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-10-18 22:43:06 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-10-18 22:43:06 (GMT)
commitac0b271dcd5f03526054b35e76a81122c2066d92 (patch)
tree15703bb00839094b541154a73ebabf849b710dd6 /generic/tclIO.c
parentf270cc876db91a80fda35fd57e55859d3a9331f6 (diff)
parentfe445f7962f05b59609189e8ec30cb508705ca37 (diff)
downloadtcl-ac0b271dcd5f03526054b35e76a81122c2066d92.zip
tcl-ac0b271dcd5f03526054b35e76a81122c2066d92.tar.gz
tcl-ac0b271dcd5f03526054b35e76a81122c2066d92.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r--generic/tclIO.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 9283bf5..207ce19 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4453,6 +4453,7 @@ Tcl_GetsObj(
eof = NULL;
inEofChar = statePtr->inEofChar;
+ ResetFlag(statePtr, CHANNEL_BLOCKED);
while (1) {
if (dst >= dstEnd) {
if (FilterInputBytes(chanPtr, &gs) != 0) {
@@ -4801,6 +4802,7 @@ TclGetsObjBinary(
eolChar = (statePtr->inputTranslation == TCL_TRANSLATE_LF) ? '\n' : '\r';
+ ResetFlag(statePtr, CHANNEL_BLOCKED);
while (1) {
/*
* Subtract the number of bytes that were removed from channel
@@ -5089,6 +5091,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;
@@ -5179,12 +5187,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 {