diff options
author | hobbs <hobbs@noemail.net> | 2002-12-06 23:22:57 (GMT) |
---|---|---|
committer | hobbs <hobbs@noemail.net> | 2002-12-06 23:22:57 (GMT) |
commit | c1f6a1c3463dbe4215a403ad960d887a7fd21911 (patch) | |
tree | 5e8124bd90814fbe5a1f2116ec1fb5a93273caed /win/tclWinInit.c | |
parent | 5183b45fff36dc6a9289895dad453da763ba0974 (diff) | |
download | tcl-c1f6a1c3463dbe4215a403ad960d887a7fd21911.zip tcl-c1f6a1c3463dbe4215a403ad960d887a7fd21911.tar.gz tcl-c1f6a1c3463dbe4215a403ad960d887a7fd21911.tar.bz2 |
* generic/tclStubInit.c: regen
* generic/tclIntPlatDecls.h: regen
* generic/tclInt.decls: added TclWinResetInterface
* win/tclWin32Dll.c (TclWinResetInterfaces):
* win/tclWinInit.c (TclpSetInitialEncodings, WinEncodingsCleanup):
add exit handler that resets the encoding information to a state
where we can reuse Tcl. Following these changes, it is possible
to reuse Tcl (following Tcl_FindExecutable or Tcl_CreateInterp)
following a Tcl_Finalize.
FossilOrigin-Name: e4ec3dc36c57ea2690faeb643e2e47eac6bc6520
Diffstat (limited to 'win/tclWinInit.c')
-rw-r--r-- | win/tclWinInit.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/win/tclWinInit.c b/win/tclWinInit.c index c4782e3..bc0c980 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclWinInit.c,v 1.35 2002/02/08 02:52:55 dgp Exp $ + * RCS: @(#) $Id: tclWinInit.c,v 1.36 2002/12/06 23:22:59 hobbs Exp $ */ #include "tclWinInt.h" @@ -461,7 +461,34 @@ ToUtf( *dst = '\0'; return (int) (dst - start); } + +/* + *--------------------------------------------------------------------------- + * + * WinEncodingsCleanup -- + * + * Reset information to its original state in finalization to + * allow for reinitialization to be possible. + * + * Results: + * None. + * + * Side effects: + * Static information reset to startup state. + * + *--------------------------------------------------------------------------- + */ +static void +WinEncodingsCleanup(ClientData clientData) +{ + TclWinResetInterfaces(); + libraryPathEncodingFixed = 0; + if (binaryEncoding != NULL) { + Tcl_FreeEncoding(binaryEncoding); + binaryEncoding = NULL; + } +} /* *--------------------------------------------------------------------------- @@ -538,6 +565,8 @@ TclpSetInitialEncodings() encoding = "iso8859-1"; binaryEncoding = Tcl_GetEncoding(NULL, encoding); } + + Tcl_CreateExitHandler(WinEncodingsCleanup, NULL); } /* |