summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-10-17 20:37:45 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-10-17 20:37:45 (GMT)
commit8725bdd35e6d66a97627786c0972a9cc5c502828 (patch)
tree821ce4406056ff6e7eedc3050220ac95b8a3ef34 /generic
parent65acf25995e78db3c34b4cfd4998caf4edd4a5d8 (diff)
downloadtcl-8725bdd35e6d66a97627786c0972a9cc5c502828.zip
tcl-8725bdd35e6d66a97627786c0972a9cc5c502828.tar.gz
tcl-8725bdd35e6d66a97627786c0972a9cc5c502828.tar.bz2
Revert the Tcl_GetsObj portion of the last commit.
Although it fixed the bug demonstrated by the test io-33.12, it caused new breakage in [gets] not yet understood. Test io-33.12 left in place to prompt further work.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index e786946..e05249e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4042,7 +4042,6 @@ Tcl_GetsObj(
eof = NULL;
inEofChar = statePtr->inEofChar;
- ResetFlag(statePtr, CHANNEL_BLOCKED);
while (1) {
if (dst >= dstEnd) {
if (FilterInputBytes(chanPtr, &gs) != 0) {
@@ -4212,10 +4211,6 @@ Tcl_GetsObj(
}
goto gotEOL;
}
- if (GotFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_NONBLOCKING)
- == (CHANNEL_BLOCKED|CHANNEL_NONBLOCKING)) {
- goto restore;
- }
dst = dstEnd;
}