summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2004-04-23 23:40:58 (GMT)
committerandreas_kupries <akupries@shaw.ca>2004-04-23 23:40:58 (GMT)
commit3c6bff5072deff3c93b25e7093a21e84b788df3f (patch)
treef1b858e5ab7fa64e398ca3e41444b812b9ac18e9 /generic
parente4357f99416ff3c38085702ce9524e7d0cca56e1 (diff)
downloadtcl-3c6bff5072deff3c93b25e7093a21e84b788df3f.zip
tcl-3c6bff5072deff3c93b25e7093a21e84b788df3f.tar.gz
tcl-3c6bff5072deff3c93b25e7093a21e84b788df3f.tar.bz2
* generic/tclIO.c (Tcl_SetChannelOption): Fixed [SF Tcl Bug
930851]. When changing the eofchar we have to zap the related flags to prevent them from prematurely aborting the next read.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 51a105b..2e10b99 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIO.c,v 1.61.2.3 2004/02/02 22:00:30 davygrvy Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.61.2.4 2004/04/23 23:40:58 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -6459,6 +6459,15 @@ Tcl_SetChannelOption(interp, chan, optionName, newValue)
if (argv != NULL) {
ckfree((char *) argv);
}
+
+ /*
+ * [SF Tcl Bug 930851] Reset EOF and BLOCKED flags. Changing
+ * the character which signals eof can transform a current eof
+ * condition into a 'go ahead'. Ditto for blocked.
+ */
+
+ statePtr->flags &= (~(CHANNEL_EOF | CHANNEL_STICKY_EOF | CHANNEL_BLOCKED));
+
return TCL_OK;
} else if ((len > 1) && (optionName[1] == 't') &&
(strncmp(optionName, "-translation", len) == 0)) {