summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authormdejong <mdejong>2003-01-26 05:59:37 (GMT)
committermdejong <mdejong>2003-01-26 05:59:37 (GMT)
commitbb7fd9a6b22b81948f940088e8e810b7d3673fd1 (patch)
tree2e93369723b56eef9c19628901fb5aea461eeb5a /generic
parent45c06028d02a86a2c5e83c43af1919b031a5e45f (diff)
downloadtcl-bb7fd9a6b22b81948f940088e8e810b7d3673fd1.zip
tcl-bb7fd9a6b22b81948f940088e8e810b7d3673fd1.tar.gz
tcl-bb7fd9a6b22b81948f940088e8e810b7d3673fd1.tar.bz2
* generic/tclIO.c (Tcl_CutChannel, Tcl_SpliceChannel):
Invoke TclpCutFileChannel and TclpSpliceFileChannel. * generic/tclInt.h: Declare TclpCutFileChannel and TclpSpliceFileChannel. * unix/tclUnixChan.c (FileCloseProc, TclpOpenFileChannel, Tcl_MakeFileChannel, TclpCutFileChannel, TclpSpliceFileChannel): Implement thread load data cut and splice for file channels. This avoids an invalid memory ref when compiled with -DDEPRECATED. * win/tclWinChan.c (FileCloseProc, TclpCutFileChannel, TclpSpliceFileChannel): Implement thread load data cut and splice for file channels. This avoids an invalid memory ref that was showing up in the thread extension.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c6
-rw-r--r--generic/tclInt.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index e1298d5..5e2338d 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.58 2003/01/24 11:59:29 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.59 2003/01/26 05:59:37 mdejong Exp $
*/
#include "tclInt.h"
@@ -2409,6 +2409,8 @@ Tcl_CutChannel(chan)
}
statePtr->nextCSPtr = (ChannelState *) NULL;
+
+ TclpCutFileChannel(chan);
}
/*
@@ -2460,6 +2462,8 @@ Tcl_SpliceChannel(chan)
*/
statePtr->managingThread = Tcl_GetCurrentThread ();
+
+ TclpSpliceFileChannel(chan);
}
/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index ff49a21..62a2cc3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.115 2003/01/17 14:19:49 vincentdarley Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.116 2003/01/26 05:59:37 mdejong Exp $
*/
#ifndef _TCLINT
@@ -1777,6 +1777,8 @@ EXTERN int TclpObjStat _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_StatBuf *buf));
EXTERN Tcl_Channel TclpOpenFileChannel _ANSI_ARGS_((Tcl_Interp *interp,
Tcl_Obj *pathPtr, int mode,
int permissions));
+EXTERN void TclpCutFileChannel _ANSI_ARGS_((Tcl_Channel chan));
+EXTERN void TclpSpliceFileChannel _ANSI_ARGS_((Tcl_Channel chan));
EXTERN void TclpPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,
format));
EXTERN char * TclpReadlink _ANSI_ARGS_((CONST char *fileName,