diff options
| author | mdejong <mdejong@noemail.net> | 2003-01-28 11:03:51 (GMT) |
|---|---|---|
| committer | mdejong <mdejong@noemail.net> | 2003-01-28 11:03:51 (GMT) |
| commit | ab924776f5c65a07ebd3d8587a970da77c262f8b (patch) | |
| tree | 0d80c7636b80e9cbc711f955484d08371b889346 /win/tclWinPipe.c | |
| parent | cdfc0bbb4a33dc01e55ca364c5fa272a89baa95f (diff) | |
| download | tcl-ab924776f5c65a07ebd3d8587a970da77c262f8b.zip tcl-ab924776f5c65a07ebd3d8587a970da77c262f8b.tar.gz tcl-ab924776f5c65a07ebd3d8587a970da77c262f8b.tar.bz2 | |
* generic/tcl.h: Add TCL_PREFIX_IDENT and
TCL_DEBUG_IDENT, used only by TclpCreateProcess.
* unix/Makefile.in: Define TCL_DBGX.
* win/Makefile.in: Define TCL_DBGX.
* win/tclWinPipe.c (TclpCreateProcess):
Check that the Tcl pipe dll actually exists
in the Tcl bin directory and panic if it
is not found. Incorporate TCL_DBGX into
the Tcl pipe dll name. This fixes a really
mysterious error that would show up when
exec'ing a 16 bit application under Win95
or Win98 when Tcl was compiled with symbols.
The error seemed to indicate that the executable
could not be found, but it was actually the
Tcl pipe dll that could not be found.
FossilOrigin-Name: 0b07cfddbf23805efeb58193ba06b4c78ecba796
Diffstat (limited to 'win/tclWinPipe.c')
| -rw-r--r-- | win/tclWinPipe.c | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index a8071c0..319ce3e 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.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: tclWinPipe.c,v 1.32 2002/12/17 02:47:39 davygrvy Exp $ + * RCS: @(#) $Id: tclWinPipe.c,v 1.33 2003/01/28 11:03:53 mdejong Exp $ */ #include "tclWinInt.h" @@ -1201,8 +1201,40 @@ TclpCreateProcess( startInfo.dwFlags |= STARTF_USESHOWWINDOW; createFlags = CREATE_NEW_CONSOLE; } - Tcl_DStringAppend(&cmdLine, "tclpip" STRINGIFY(TCL_MAJOR_VERSION) - STRINGIFY(TCL_MINOR_VERSION) ".dll ", -1); + + { + Tcl_Obj *tclExePtr, *pipeDllPtr; + int i, fileExists; + char *start,*end; + Tcl_DString pipeDll; + Tcl_DStringInit(&pipeDll); + Tcl_DStringAppend(&pipeDll, TCL_PREFIX_IDENT "tclpip" + STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) + STRINGIFY(TCL_DEBUG_IDENT) ".dll ", -1); + tclExePtr = Tcl_NewStringObj(TclpFindExecutable(""), -1); + start = Tcl_GetStringFromObj(tclExePtr, &i); + for (end = start + (i-1); end > start; end--) { + if (*end == '/') + break; + } + if (*end != '/') + panic("no / in executable path name"); + i = (end - start) + 1; + pipeDllPtr = Tcl_NewStringObj(start, i); + Tcl_AppendToObj(pipeDllPtr, Tcl_DStringValue(&pipeDll), -1); + Tcl_IncrRefCount(pipeDllPtr); + if (Tcl_FSConvertToPathType(interp, pipeDllPtr) != TCL_OK) + panic("Tcl_FSConvertToPathType failed"); + fileExists = (Tcl_FSAccess(pipeDllPtr, F_OK) == 0); + if (!fileExists) { + panic("Tcl pipe dll \"%s\" not found", + Tcl_DStringValue(&pipeDll)); + } + Tcl_DStringAppend(&cmdLine, Tcl_DStringValue(&pipeDll), -1); + Tcl_DecrRefCount(tclExePtr); + Tcl_DecrRefCount(pipeDllPtr); + Tcl_DStringFree(&pipeDll); + } } } |