summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-04-15 18:31:00 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-04-15 18:31:00 (GMT)
commitbc5dab9966108ba8082e389fc4a42e060cce440e (patch)
tree47b7f0cb5e199796391f1815fe3338f47f492d86 /generic
parentc8c10de926e7c958c17e8898fc18d2ca1ad50cf7 (diff)
downloadtcl-bc5dab9966108ba8082e389fc4a42e060cce440e.zip
tcl-bc5dab9966108ba8082e389fc4a42e060cce440e.tar.gz
tcl-bc5dab9966108ba8082e389fc4a42e060cce440e.tar.bz2
* generic/tclIO.c (CopyData): Applied another patch by Alexandre
* io.test (io-53.8a): Ferrieux <ferrieux@users.sourceforge.net>, to shift EOF handling to the async part of the command if a callback is specified, should the channel be at EOF already when fcopy is called. Testcase by myself.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 3f79021..6502215 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.27 2008/04/07 22:17:37 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.61.2.28 2008/04/15 18:31:01 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -7887,15 +7887,18 @@ CopyData(csPtr, mask)
break;
} else if (underflow) {
/*
- * We had an underflow on the read side. If we are at EOF,
- * then the copying is done, otherwise set up a channel
- * handler to detect when the channel becomes readable again.
+ * We had an underflow on the read side. If we are at
+ * EOF, and not in the synchronous part of an asynchronous
+ * fcopy, then the copying is done, otherwise set up a
+ * channel handler to detect when the channel becomes
+ * readable again.
*/
- if ((size == 0) && Tcl_Eof(inChan)) {
+ if ((size == 0) && Tcl_Eof(inChan) && !(cmdPtr && (mask == 0))) {
break;
}
- if (! Tcl_Eof(inChan) && !(mask & TCL_READABLE)) {
+ if (((!Tcl_Eof(inChan)) || (cmdPtr && (mask == 0))) &&
+ !(mask & TCL_READABLE)) {
if (mask & TCL_WRITABLE) {
Tcl_DeleteChannelHandler(outChan, CopyEventProc,
(ClientData) csPtr);