diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-09 01:48:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-09 01:48:31 (GMT) |
| commit | 1061121812191fb6a50842007771b34c289131da (patch) | |
| tree | d1beba8c0233d9c74a0c2a6b90e69e959f14636c /generic/tclIO.c | |
| parent | c88725ffebf6be846bce8f33ddee5a39eea664a3 (diff) | |
| parent | cf9cce374ed8d3bc405f998d01d9965d224bc482 (diff) | |
| download | tcl-1061121812191fb6a50842007771b34c289131da.zip tcl-1061121812191fb6a50842007771b34c289131da.tar.gz tcl-1061121812191fb6a50842007771b34c289131da.tar.bz2 | |
merge trunk
<p>Dont include U+0082 and U+0083 in the Tcl space set
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 4e24533..0cb9fa9 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -879,19 +879,25 @@ CheckForStdChannelsBeingClosed( ChannelState *statePtr = ((Channel *) chan)->state; ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); - if ((chan == tsdPtr->stdinChannel) && tsdPtr->stdinInitialized) { + if (tsdPtr->stdinInitialized + && tsdPtr->stdinChannel != NULL + && statePtr == ((Channel *)tsdPtr->stdinChannel)->state) { if (statePtr->refCount < 2) { statePtr->refCount = 0; tsdPtr->stdinChannel = NULL; return; } - } else if ((chan == tsdPtr->stdoutChannel) && tsdPtr->stdoutInitialized) { + } else if (tsdPtr->stdoutInitialized + && tsdPtr->stdoutChannel != NULL + && statePtr == ((Channel *)tsdPtr->stdoutChannel)->state) { if (statePtr->refCount < 2) { statePtr->refCount = 0; tsdPtr->stdoutChannel = NULL; return; } - } else if ((chan == tsdPtr->stderrChannel) && tsdPtr->stderrInitialized) { + } else if (tsdPtr->stderrInitialized + && tsdPtr->stderrChannel != NULL + && statePtr == ((Channel *)tsdPtr->stderrChannel)->state) { if (statePtr->refCount < 2) { statePtr->refCount = 0; tsdPtr->stderrChannel = NULL; |