summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2009-11-10 23:50:17 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2009-11-10 23:50:17 (GMT)
commit69e155a5691d03e8293409bdc307651f0c92494e (patch)
treec1aafc7d762cb2ef9d001610a18330c149044fe5 /generic
parentcc9f7a669ed8913de4f2b1dbee1bf961297a4c02 (diff)
downloadtcl-69e155a5691d03e8293409bdc307651f0c92494e.zip
tcl-69e155a5691d03e8293409bdc307651f0c92494e.tar.gz
tcl-69e155a5691d03e8293409bdc307651f0c92494e.tar.bz2
Fix [Bug 2888099] (close discards ENOSPC error) by saving the errno
from the first of two FlushChannel()s. Uneasy to test; might need specific channel drivers. Four-hands with aku.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 439eac2..e295c82 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.165 2009/11/09 13:47:23 dkf Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.166 2009/11/10 23:50:17 ferrieux Exp $
*/
#include "tclInt.h"
@@ -2976,6 +2976,7 @@ Tcl_Close(
ChannelState *statePtr; /* State of real IO channel. */
int result; /* Of calling FlushChannel. */
int flushcode;
+ int stickyError;
if (chan == NULL) {
return TCL_OK;
@@ -3017,10 +3018,14 @@ Tcl_Close(
* iso2022, the terminated escape sequence must write to the buffer.
*/
+ stickyError = 0;
+
if ((statePtr->encoding != NULL) && (statePtr->curOutPtr != NULL)
&& (CheckChannelErrors(statePtr, TCL_WRITABLE) == 0)) {
statePtr->outputEncodingFlags |= TCL_ENCODING_END;
- WriteChars(chanPtr, "", 0);
+ if (WriteChars(chanPtr, "", 0) < 0) {
+ stickyError = Tcl_GetErrno();
+ }
/*
* TIP #219, Tcl Channel Reflection API.
@@ -3099,6 +3104,14 @@ Tcl_Close(
result = EINVAL;
}
+ if (stickyError != 0) {
+ Tcl_SetErrno(stickyError);
+ if (interp != NULL) {
+ Tcl_SetObjResult(interp,
+ Tcl_NewStringObj(Tcl_PosixError(interp), -1));
+ }
+ flushcode = -1;
+ }
if ((flushcode != 0) || (result != 0)) {
return TCL_ERROR;
}
@@ -11195,5 +11208,7 @@ DumpFlags(
* mode: c
* c-basic-offset: 4
* fill-column: 78
+ * tab-width: 8
+ * indent-tabs-mode: nil
* End:
*/