From 1dc34345abbeeb394c746abc809889b36af93584 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Thu, 13 Nov 2008 22:34:33 +0000
Subject: rename static function FSUnloadTempFile to TclFSUnloadTempFile,
 needed in tclLoad.c Fixed [Bug 2269431]: load of shared objects leaves
 temporary files on windows

---
 ChangeLog           |  8 ++++++++
 generic/tclIOUtil.c | 16 +++++-----------
 generic/tclInt.h    |  3 ++-
 generic/tclLoad.c   | 11 +++++++----
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ecb8b7..c4b6d82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-13  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclInt.h:     rename static function FSUnloadTempFile to
+	* generic/tclIOUtil.c   TclFSUnloadTempFile, needed in tclLoad.c
+
+	* generic/tclLoad.c     Fixed [Bug 2269431]: load of shared
+	                        objects leaves temporary files on windows
+
 2008-11-12  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* tests/registry.test: Use HKCU to avoid requiring admin access
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 077eb96..607397e 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIOUtil.c,v 1.158 2008/10/05 22:25:35 nijtmans Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.159 2008/11/13 22:34:33 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -192,12 +192,6 @@ TCL_DECLARE_MUTEX(cwdMutex)
 Tcl_ThreadDataKey tclFsDataKey;
 
 /*
- * Declare fallback support function and information for Tcl_FSLoadFile
- */
-
-static Tcl_FSUnloadFileProc	FSUnloadTempFile;
-
-/*
  * One of these structures is used each time we successfully load a file from
  * a file system by way of making a temporary copy of the file on the native
  * filesystem. We need to store both the actual unloadProc/clientData
@@ -3187,7 +3181,7 @@ TclLoadFile(
     copyToPtr = NULL;
     *handlePtr = newLoadHandle;
     *clientDataPtr = tvdlPtr;
-    *unloadProcPtr = &FSUnloadTempFile;
+    *unloadProcPtr = TclFSUnloadTempFile;
 
     Tcl_ResetResult(interp);
     return retVal;
@@ -3252,7 +3246,7 @@ TclpLoadFile(
 /*
  *---------------------------------------------------------------------------
  *
- * FSUnloadTempFile --
+ * TclFSUnloadTempFile --
  *
  *	This function is called when we loaded a library of code via an
  *	intermediate temporary file. This function ensures the library is
@@ -3268,8 +3262,8 @@ TclpLoadFile(
  *---------------------------------------------------------------------------
  */
 
-static void
-FSUnloadTempFile(
+void
+TclFSUnloadTempFile(
     Tcl_LoadHandle loadHandle)	/* loadHandle returned by a previous call to
 				 * Tcl_FSLoadFile(). The loadHandle is a token
 				 * that represents the loaded file. */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index f0c922f..027e93e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -15,7 +15,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.405 2008/11/07 20:10:19 patthoyts Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.406 2008/11/13 22:34:33 nijtmans Exp $
  */
 
 #ifndef _TCLINT
@@ -2642,6 +2642,7 @@ MODULE_SCOPE double	TclFloor(mp_int *a);
 MODULE_SCOPE void	TclFormatNaN(double value, char *buffer);
 MODULE_SCOPE int	TclFSFileAttrIndex(Tcl_Obj *pathPtr,
 			    const char *attributeName, int *indexPtr);
+MODULE_SCOPE void	TclFSUnloadTempFile(Tcl_LoadHandle loadHandle);
 MODULE_SCOPE int *	TclGetAsyncReadyPtr(void);
 MODULE_SCOPE Tcl_Obj *	TclGetBgErrorHandler(Tcl_Interp *interp);
 MODULE_SCOPE int	TclGetChannelFromObj(Tcl_Interp *interp,
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 36a61b0..c2a677b 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoad.c,v 1.20 2008/10/16 22:34:18 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoad.c,v 1.21 2008/11/13 22:34:33 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -791,7 +791,7 @@ Tcl_UnloadObjCmd(
 
 	    if (unLoadProcPtr != NULL) {
 		Tcl_MutexLock(&packageMutex);
-		if (pkgPtr->unloadProc != NULL) {
+		if ((pkgPtr->unloadProc != NULL) || (unLoadProcPtr == TclFSUnloadTempFile)) {
 		    unLoadProcPtr(pkgPtr->loadHandle);
 		}
 
@@ -1146,8 +1146,11 @@ TclFinalizeLoad(void)
 	 */
 
 	if (pkgPtr->fileName[0] != '\0') {
-	    if ((pkgPtr->unLoadProcPtr != NULL) && (pkgPtr->unloadProc != NULL)) {
-		pkgPtr->unLoadProcPtr(pkgPtr->loadHandle);
+	    Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr;
+	    if ((unLoadProcPtr != NULL)
+		    && ((pkgPtr->unloadProc != NULL)
+		    || (unLoadProcPtr == TclFSUnloadTempFile))) {
+		unLoadProcPtr(pkgPtr->loadHandle);
 	    }
 	}
 #endif
-- 
cgit v0.12