diff options
| author | kjnash <k.j.nash@usa.net> | 2022-10-26 12:35:18 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2022-10-26 12:35:18 (GMT) |
| commit | 1e0a98c9aa064a2472cb7a62b51b86252528782b (patch) | |
| tree | e8abd26b5fc9a3e83614c3d3a01290eb551939f4 /generic/tclIO.c | |
| parent | 2ecf92f50b4fad000f8cf4b368ce47c6035bdf4c (diff) | |
| parent | 42b1c587058185cf982966c733806b5d6dd8625d (diff) | |
| download | tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.zip tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.tar.gz tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 18 |
1 files changed, 11 insertions, 7 deletions
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) { |