summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-08 17:02:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-08 17:02:45 (GMT)
commit56de8426b72bb8a143b98cd358f3a39cc4dae0f8 (patch)
tree6d0edead575b890159512500f81306f031a4410d /generic
parenta79de57d3737b8a2d0b80611521437585653f877 (diff)
parentbd8e0ee8b7e71085e6e3ff9a22dbc8b2b28a77f7 (diff)
downloadtcl-56de8426b72bb8a143b98cd358f3a39cc4dae0f8.zip
tcl-56de8426b72bb8a143b98cd358f3a39cc4dae0f8.tar.gz
tcl-56de8426b72bb8a143b98cd358f3a39cc4dae0f8.tar.bz2
Merge 8.7
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 15c348d..0784185 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4365,6 +4365,8 @@ Write(
if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
+ } else {
+ statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
}
/*
@@ -4690,6 +4692,8 @@ Tcl_GetsObj(
if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+ } else {
+ statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
}
/*
@@ -5456,6 +5460,8 @@ FilterInputBytes(
if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+ } else {
+ statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
}
result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
@@ -6237,6 +6243,8 @@ ReadChars(
if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+ } else {
+ statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
}
/*
@@ -8250,6 +8258,8 @@ Tcl_SetChannelOption(
}
if (newMode) {
SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
+ } else {
+ ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
}
return TCL_OK;
} else if (HaveOpt(1, "-translation")) {