summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-11-06 21:47:32 (GMT)
committerhobbs <hobbs>2003-11-06 21:47:32 (GMT)
commitc5930f8386355d42d6789a95167916d37b975b72 (patch)
tree61adbb86f2d01f14f4551306fe662ff3541dedef /generic
parent3361d6ad5280072793769743494feecf91d1c3fc (diff)
downloadtcl-c5930f8386355d42d6789a95167916d37b975b72.zip
tcl-c5930f8386355d42d6789a95167916d37b975b72.tar.gz
tcl-c5930f8386355d42d6789a95167916d37b975b72.tar.bz2
* tests/unixInit.test (unixInit-2.10): mark as knownBug
* generic/tclEncoding.c (TclFindEncodings): revert patch from 2003-11-05. It wasn't valid in the sensitive startup init phase and broke Windows from working at all.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclEncoding.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 87f4669..7f27ab8 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.1 2003/11/05 20:52:39 dgp Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.2 2003/11/06 21:47:33 hobbs Exp $
*/
#include "tclInt.h"
@@ -2801,7 +2801,6 @@ unilen(src)
}
return (char *) p - src;
}
-
/*
*-------------------------------------------------------------------------
@@ -2827,9 +2826,6 @@ TclFindEncodings(argv0)
CONST char *argv0; /* Name of executable from argv[0] to main()
* in native multi-byte encoding. */
{
- Tcl_Obj *pathPtr, *normPtr;
- Tcl_DString libPath, buffer;
-
if (encodingsInitialized == 0) {
/*
* Double check inside the mutex. There may be calls
@@ -2838,6 +2834,10 @@ TclFindEncodings(argv0)
TclpInitLock();
if (encodingsInitialized == 0) {
+ char *native;
+ Tcl_Obj *pathPtr;
+ Tcl_DString libPath, buffer;
+
/*
* Have to set this bit here to avoid deadlock with the
* routines below us that call into TclInitSubsystems.
@@ -2845,13 +2845,8 @@ TclFindEncodings(argv0)
encodingsInitialized = 1;
- pathPtr = Tcl_NewStringObj(TclpFindExecutable(argv0), -1);
- Tcl_IncrRefCount(pathPtr);
- normPtr = Tcl_FSGetNormalizedPath(NULL, pathPtr);
- Tcl_IncrRefCount(normPtr);
- Tcl_DecrRefCount(pathPtr);
- TclpInitLibraryPath(Tcl_GetString(normPtr));
- Tcl_DecrRefCount(normPtr);
+ native = TclpFindExecutable(argv0);
+ TclpInitLibraryPath(native);
/*
* The library path was set in the TclpInitLibraryPath routine.
@@ -2885,4 +2880,3 @@ TclFindEncodings(argv0)
TclpInitUnlock();
}
}
-