TIP #646: Change -eofchar handling (Tcl 8.7 part)

13 files changed, 149 insertions, 146 deletions

diff --git a/changes b/changes
index 52e6f81..ac0d810 100644
--- a/changes
+++ b/changes
@@ -9232,7 +9232,7 @@ See RFC 2045
 2020-09-17 (bug)[835c93] Support TIP 525 exit code for -singleproc 1 (nijtmans)
 => tcltest 2.5.3
 
-2020-09-25 (new) force -eofchar \032 when evaluating library scripts (nijtmans)
+2020-09-25 (new) force -eofchar \x1A when evaluating library scripts (nijtmans)
         *** POTENTIAL INCOMPATIBILITY ***
 
 2020-09-29 (bug)[0063cb] http::geturl -headers must be dict (oehlmann,nijtmans)
diff --git a/doc/chan.n b/doc/chan.n
index 9589f98..bf6c85c 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -144,15 +144,14 @@ interface with the operating system,
 .TP
 \fB\-eofchar\fR \fIchar\fR
 .TP
-\fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
+\fB\-eofchar\fR \fB{\fIchar outChar\fB}\fR
 .
 \fIchar\fR signals the end of the data when it is encountered in the input.
-For output, the character is added when the channel is closed.  If \fIchar\fR
+For output, \fIoutChar\fR is added when the channel is closed.  If \fIchar\fR
 is the empty string, there is no special character that marks the end of the
 data.  For read-write channels, one end-of-file character for input and another
 for output may be given.  When only one end-of-file character is given it is
-applied to both input and output.  For a read-write channel two values are
-returned even if they are are identical.
+applied to input only.
 
 The default value is the empty string, except that under Windows the default
 value for reading is Control-z (\ex1A).  The acceptable range is \ex01 -
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 2926777..4bb9fc6 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -103,7 +103,7 @@ system, as returned by \fBencoding system\fR.
 .TP
 \fB\-eofchar\fR \fIchar\fR
 .TP
-\fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
+\fB\-eofchar\fR \fB{\fIchar outChar\fB}\fR
 .
 This option supports DOS file systems that use Control-z (\ex1A) as an
 end of file marker.  If \fIchar\fR is not an empty string, then this
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6a9c306..4002934 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4655,7 +4655,8 @@ Tcl_GetsObj(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
     ChannelBuffer *bufPtr;
-    int inEofChar, skip, copiedTotal, oldLength, oldFlags, oldRemoved;
+    int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
+    int oldLength;
     Tcl_Encoding encoding;
     char *dst, *dstEnd, *eol, *eof;
     Tcl_EncodingState oldState;
@@ -8156,7 +8157,7 @@ Tcl_SetChannelOption(
 				/* State info for channel */
     size_t len;			/* Length of optionName string. */
     int argc;
-    const char **argv;
+    const char **argv = NULL;
 
     /*
      * If the channel is in the middle of a background copy, fail.
@@ -8262,16 +8263,19 @@ Tcl_SetChannelOption(
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
-	if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
+	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
+	    if (GotFlag(statePtr, TCL_READABLE)) {
+		statePtr->inEofChar = newValue[0];
+	    }
+	    statePtr->outEofChar = 0;
+	} else if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
 	    return TCL_ERROR;
-	}
-	if (argc == 0) {
+	} else if (argc == 0) {
 	    statePtr->inEofChar = 0;
 	    statePtr->outEofChar = 0;
 	} else if (argc == 1 || argc == 2) {
-	    int outIndex = (argc - 1);
 	    int inValue = (int) argv[0][0];
-	    int outValue = (int) argv[outIndex][0];
+	    int outValue = (argc == 2) ? (int) argv[1][0] : 0;
 
 	    if (inValue & 0x80 || outValue & 0x80) {
 		if (interp) {
diff --git a/library/install.tcl b/library/install.tcl
index ce8e80b..50e40df 100644
--- a/library/install.tcl
+++ b/library/install.tcl
@@ -35,7 +35,7 @@ proc ::practcl::_pkgindex_directory {path} {
       # Read the file, and override assumptions as needed
       ###
       set fin [open $file r]
-      fconfigure $fin -encoding utf-8 -eofchar "\032 {}"
+      fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
       set dat [read $fin]
       close $fin
       # Look for a teapot style Package statement
@@ -59,7 +59,7 @@ proc ::practcl::_pkgindex_directory {path} {
     foreach file [glob -nocomplain $path/*.tcl] {
       if { [file tail $file] == "version_info.tcl" } continue
       set fin [open $file r]
-      fconfigure $fin -encoding utf-8 -eofchar "\032 {}"
+      fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
       set dat [read $fin]
       close $fin
       if {![regexp "package provide" $dat]} continue
@@ -79,7 +79,7 @@ proc ::practcl::_pkgindex_directory {path} {
     return $buffer
   }
   set fin [open $pkgidxfile r]
-  fconfigure $fin -encoding utf-8 -eofchar "\032 {}"
+  fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
   set dat [read $fin]
   close $fin
   set trace 0
diff --git a/tests/chanio.test b/tests/chanio.test
index 8d922a2..7d9c3e5 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -80,7 +80,7 @@ namespace eval ::tcl::test::io {
 	if {$argv != ""} {
 	    set f [open [lindex $argv 0]]
 	}
-	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar \x1A
+	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar "\x1A \x1A"
 	chan configure stdout -encoding binary -translation lf -buffering none
 	chan event $f readable "foo $f"
 	proc foo {f} {
@@ -481,7 +481,7 @@ test chan-io-6.8 {Tcl_GetsObj: remember if EOF is seen} -body {
     chan puts $f "abcdef\x1Aghijk\nwombat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -491,7 +491,7 @@ test chan-io-6.9 {Tcl_GetsObj: remember if EOF is seen} -body {
     chan puts $f "abcdefghijk\nwom\x1Abat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -999,7 +999,7 @@ test chan-io-6.52 {Tcl_GetsObj: saw EOF character} -constraints {testchannel} -b
     chan puts -nonewline $f "123456\x1Ak9012345\r"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f] [testchannel queuedcr $f] [chan tell $f] [chan gets $f]
 } -cleanup {
     chan close $f
@@ -3105,7 +3105,7 @@ test chan-io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} -setup {
     chan puts -nonewline $f hello\nthere\nand\rhere\n\x1A
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan read $f
 } -cleanup {
     chan close $f
@@ -3118,11 +3118,11 @@ test chan-io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} -setup {
     file delete $path(test1)
 } -constraints {win} -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan read $f
 } -cleanup {
     chan close $f
@@ -3140,7 +3140,7 @@ test chan-io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3161,7 +3161,7 @@ test chan-io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3239,7 +3239,7 @@ test chan-io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f [format abc\ndef\n%cqrs\ntuv 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3253,7 +3253,7 @@ test chan-io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3267,7 +3267,7 @@ test chan-io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3281,7 +3281,7 @@ test chan-io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3295,7 +3295,7 @@ test chan-io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3309,7 +3309,7 @@ test chan-io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3660,7 +3660,7 @@ test chan-io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} -setup {
     chan puts $f [format "hello\nthere\nand\rhere\n\%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3676,11 +3676,11 @@ test chan-io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} -setup {
     set l ""
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3700,7 +3700,7 @@ test chan-io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3718,7 +3718,7 @@ test chan-io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar}
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3802,7 +3802,7 @@ test chan-io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3820,7 +3820,7 @@ test chan-io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3838,7 +3838,7 @@ test chan-io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3856,7 +3856,7 @@ test chan-io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3874,7 +3874,7 @@ test chan-io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3892,7 +3892,7 @@ test chan-io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -4648,12 +4648,12 @@ test chan-io-35.6 {Tcl_Eof, eof char, lf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4662,12 +4662,12 @@ test chan-io-35.7 {Tcl_Eof, eof char, lf write, lf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4676,12 +4676,12 @@ test chan-io-35.8 {Tcl_Eof, eof char, cr write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4690,12 +4690,12 @@ test chan-io-35.9 {Tcl_Eof, eof char, cr write, cr read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4704,12 +4704,12 @@ test chan-io-35.10 {Tcl_Eof, eof char, crlf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4718,12 +4718,12 @@ test chan-io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4737,7 +4737,7 @@ test chan-io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4751,7 +4751,7 @@ test chan-io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4765,7 +4765,7 @@ test chan-io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4779,7 +4779,7 @@ test chan-io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4793,7 +4793,7 @@ test chan-io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4807,7 +4807,7 @@ test chan-io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -5290,7 +5290,7 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar {ON GO}
     lappend l [chan configure $f1 -eofchar]
-    chan configure $f1 -eofchar D
+    chan configure $f1 -eofchar {D D}
     lappend l [chan configure $f1 -eofchar]
 } -cleanup {
     chan close $f1
@@ -5302,7 +5302,7 @@ test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     set f1 [open $path(test1) w+]
     chan configure $f1 -eofchar {ON GO}
     lappend l [chan configure $f1 -eofchar]
-    chan configure $f1 -eofchar D
+    chan configure $f1 -eofchar {D D}
     lappend l [chan configure $f1 -eofchar]
     lappend l [list [catch {chan configure $f1 -eofchar {1 2 3}} msg] $msg]
 } -cleanup {
@@ -6047,7 +6047,7 @@ test chan-io-48.4 {lf write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6071,7 +6071,7 @@ test chan-io-48.5 {lf write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6095,7 +6095,7 @@ test chan-io-48.6 {cr write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6119,7 +6119,7 @@ test chan-io-48.7 {cr write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6143,7 +6143,7 @@ test chan-io-48.8 {crlf write, testing readability, ^Z termination, auto read mo
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6167,7 +6167,7 @@ test chan-io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6191,7 +6191,7 @@ test chan-io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6215,7 +6215,7 @@ test chan-io-48.11 {lf write, testing readability, ^Z termination, lf read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6239,7 +6239,7 @@ test chan-io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6263,7 +6263,7 @@ test chan-io-48.13 {cr write, testing readability, ^Z termination, cr read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6287,7 +6287,7 @@ test chan-io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mod
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6311,7 +6311,7 @@ test chan-io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
diff --git a/tests/io.test b/tests/io.test
index f928cd3..a80e94e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -77,7 +77,7 @@ set path(cat) [makeFile {
     if {$argv != ""} {
 	set f [open [lindex $argv 0]]
     }
-    fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar \x1A
+    fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar "\x1A \x1A"
     fconfigure stdout -encoding binary -translation lf -buffering none
     fileevent $f readable "foo $f"
     proc foo {f} {
@@ -517,7 +517,7 @@ test io-6.8 {Tcl_GetsObj: remember if EOF is seen} {
     puts $f "abcdef\x1Aghijk\nwombat"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
     set x
@@ -527,7 +527,7 @@ test io-6.9 {Tcl_GetsObj: remember if EOF is seen} {
     puts $f "abcdefghijk\nwom\x1Abat"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
     set x
@@ -1036,7 +1036,7 @@ test io-6.52 {Tcl_GetsObj: saw EOF character} {testchannel} {
     puts -nonewline $f "123456\x1Ak9012345\r"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
     close $f
     set x
@@ -3382,7 +3382,7 @@ test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} {
     puts -nonewline $f hello\nthere\nand\rhere\n\x1A
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [read $f]
     close $f
     set c
@@ -3394,11 +3394,11 @@ here
 test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {win} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f hello\nthere\nand\rhere
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [read $f]
     close $f
     set c
@@ -3415,7 +3415,7 @@ test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3435,7 +3435,7 @@ test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3513,7 +3513,7 @@ test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3527,7 +3527,7 @@ test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3541,7 +3541,7 @@ test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3555,7 +3555,7 @@ test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3569,7 +3569,7 @@ test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3583,7 +3583,7 @@ test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3916,7 +3916,7 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3931,11 +3931,11 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
 test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f hello\nthere\nand\rhere
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3955,7 +3955,7 @@ test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3973,7 +3973,7 @@ test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4057,7 +4057,7 @@ test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4075,7 +4075,7 @@ test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4093,7 +4093,7 @@ test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4111,7 +4111,7 @@ test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4129,7 +4129,7 @@ test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4147,7 +4147,7 @@ test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -5028,12 +5028,12 @@ test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} stdio {
 test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5042,12 +5042,12 @@ test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
 test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5056,12 +5056,12 @@ test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
 test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5070,12 +5070,12 @@ test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
 test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5084,12 +5084,12 @@ test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
 test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5098,12 +5098,12 @@ test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
 test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5118,7 +5118,7 @@ test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5133,7 +5133,7 @@ test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5148,7 +5148,7 @@ test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5163,7 +5163,7 @@ test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5178,7 +5178,7 @@ test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5193,7 +5193,7 @@ test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5216,12 +5216,12 @@ test io-35.18 {Tcl_Eof, eof char, cr write, crlf read} -body {
 test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5230,12 +5230,12 @@ test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body {
 test io-35.18b {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f {}
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5264,7 +5264,7 @@ test io-35.19 {Tcl_Eof, eof char in middle, cr write, crlf read} -body {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5279,7 +5279,7 @@ test io-35.20 {Tcl_Eof, eof char in middle, cr write, crlf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5763,7 +5763,7 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unix} {
     lappend l [fconfigure $f1 -eofchar]
     fconfigure $f1 -eofchar {ON GO}
     lappend l [fconfigure $f1 -eofchar]
-    fconfigure $f1 -eofchar D
+    fconfigure $f1 -eofchar {D D}
     lappend l [fconfigure $f1 -eofchar]
     close $f1
     set l
@@ -5774,7 +5774,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     set l [list]
     fconfigure $f1 -eofchar {ON GO}
     lappend l [fconfigure $f1 -eofchar]
-    fconfigure $f1 -eofchar D
+    fconfigure $f1 -eofchar {D D}
     lappend l [fconfigure $f1 -eofchar]
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
@@ -6539,7 +6539,7 @@ test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6567,7 +6567,7 @@ test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {file
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6595,7 +6595,7 @@ test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6623,7 +6623,7 @@ test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {file
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6651,7 +6651,7 @@ test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6679,7 +6679,7 @@ test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6707,7 +6707,7 @@ test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6735,7 +6735,7 @@ test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {fil
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6763,7 +6763,7 @@ test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6791,7 +6791,7 @@ test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {fil
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6819,7 +6819,7 @@ test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {f
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6847,7 +6847,7 @@ test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
diff --git a/unix/README b/unix/README
index b8adc71..9dad93a 100644
--- a/unix/README
+++ b/unix/README
@@ -8,11 +8,11 @@ MacOSX platform too, but they all depend on UNIX (POSIX/ANSI C) interfaces and
 some of them only make sense under UNIX.
 
 Updated forms of the information found in this file is available at:
-	https://www.tcl-tk.org/doc/howto/compile.html#unix
+	https://www.tcl-lang.org/doc/howto/compile.html#unix
 
 For information on platforms where Tcl is known to compile, along with any
 porting notes for getting it to work on those platforms, see:
-	https://www.tcl-tk.org/software/tcltk/platforms.html
+	https://www.tcl-lang.org/software/tcltk/platforms.html
 
 The rest of this file contains instructions on how to do this. The release
 should compile and run either "out of the box" or with trivial changes on any
diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
index 21ea0ce..5f90c41 100644
--- a/unix/tcl.pc.in
+++ b/unix/tcl.pc.in
@@ -8,7 +8,7 @@ libfile=@TCL_LIB_FILE@
 
 Name: Tool Command Language
 Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
-URL: https://www.tcl-tk.org/
+URL: https://www.tcl-lang.org/
 Version: @TCL_VERSION@@TCL_PATCH_LEVEL@
 Requires.private: zlib >= 1.2.3, libtommath >= 1.2.0
 Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 62991fc..166636c 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -1325,7 +1325,7 @@ TclpGetDefaultStdChannel(
      */
 
     if (Tcl_SetChannelOption(NULL,channel,"-translation","auto")!=TCL_OK ||
-	    Tcl_SetChannelOption(NULL,channel,"-eofchar","\032 {}")!=TCL_OK ||
+	    Tcl_SetChannelOption(NULL,channel,"-eofchar","\x1A {}")!=TCL_OK ||
 	    Tcl_SetChannelOption(NULL,channel,"-buffering",bufMode)!=TCL_OK) {
 	Tcl_Close(NULL, channel);
 	return (Tcl_Channel) NULL;
@@ -1402,7 +1402,7 @@ TclWinOpenFileChannel(
      */
 
     Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
+    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\x1A {}");
 
     return infoPtr->channel;
 }
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 753a572..6688ab1 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -2199,7 +2199,7 @@ TclWinOpenConsoleChannel(
      */
 
     Tcl_SetChannelOption(NULL, chanInfoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, chanInfoPtr->channel, "-eofchar", "\032 {}");
+    Tcl_SetChannelOption(NULL, chanInfoPtr->channel, "-eofchar", "\x1A {}");
     Tcl_SetChannelOption(NULL, chanInfoPtr->channel, "-encoding", "utf-16");
     return chanInfoPtr->channel;
 }
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 4a39e8c..4a84038 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1833,7 +1833,7 @@ TclpCreateCommandChannel(
      */
 
     Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
+    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\x1A {}");
     return infoPtr->channel;
 }
 
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index f087d70..449a8d7 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -1514,7 +1514,7 @@ TclWinOpenSerialChannel(
      */
 
     Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
+    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\x1A {}");
 
     return infoPtr->channel;
 }