diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | win/tclAppInit.c | 10 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 19 |
3 files changed, 42 insertions, 6 deletions
@@ -1,3 +1,22 @@ +2002-12-03 David Gravereaux <davygrvy@pobox.com> + + * win/tclAppInit.c (sigHandler): Protect from trying to close a + NULL handle. + + * win/tclWinPipe.c (PipeClose2Proc, TclpCreateProcess): Send a + real Win32 signal (CTRL_C_EVENT) when the read channel is brought + down to alert the child to close on its side. Start the process + with CREATE_NEW_PROCESS_GROUP to allow the ability to send these + signals. The following test case now brings down the child + without the use of an external [kill] command. + + % set p [open "|[info name]" w+] + file8d5380 + % pid $p + 2876 + % close $p <- now doesn't block in Tcl_WaitPid() + % + 2002-11-27 David Gravereaux <davygrvy@pobox.com> * win/tclWinPort.h: Don't turn off winsock prototypes! diff --git a/win/tclAppInit.c b/win/tclAppInit.c index b589027..864f59a 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclAppInit.c,v 1.10 2002/11/04 05:50:19 davygrvy Exp $ + * RCS: @(#) $Id: tclAppInit.c,v 1.11 2002/12/04 03:59:17 davygrvy Exp $ */ #include "tcl.h" @@ -376,6 +376,7 @@ asyncExit (ClientData clientData, Tcl_Interp *interp, int code) BOOL __stdcall sigHandler(DWORD fdwCtrlType) { + HANDLE hStdIn; /* * If Tcl is currently executing some bytecode or in the eventloop, * this will cause Tcl to enter asyncExit at the next command @@ -388,8 +389,11 @@ sigHandler(DWORD fdwCtrlType) * This will cause Tcl_Gets in Tcl_Main() to drop-out with an <EOF> * should it be blocked on input and our Tcl_AsyncMark didn't grab * the attention of the interpreter. - */ - CloseHandle(GetStdHandle(STD_INPUT_HANDLE)); + */ + hStdIn = GetStdHandle(STD_INPUT_HANDLE); + if (hStdIn) { + CloseHandle(hStdIn); + } /* indicate to the OS not to call the default terminator */ return TRUE; diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 8a6fc59..9de247c 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.27 2002/11/26 22:35:20 davygrvy Exp $ + * RCS: @(#) $Id: tclWinPipe.c,v 1.28 2002/12/04 03:59:17 davygrvy Exp $ */ #include "tclWinInt.h" @@ -1143,7 +1143,7 @@ TclpCreateProcess( if (TclWinGetPlatformId() == VER_PLATFORM_WIN32_NT) { if (HasConsole()) { - createFlags = 0; + createFlags = CREATE_NEW_PROCESS_GROUP; } else if (applType == APPL_DOS) { /* * Under NT, 16-bit DOS applications will not run unless they @@ -1162,7 +1162,7 @@ TclpCreateProcess( } } else { if (HasConsole()) { - createFlags = 0; + createFlags = CREATE_NEW_PROCESS_GROUP; } else { createFlags = DETACHED_PROCESS; } @@ -1852,6 +1852,19 @@ PipeClose2Proc( errorCode = 0; if ((!flags || (flags == TCL_CLOSE_READ)) && (pipePtr->readFile != NULL)) { + + /* + * Send the console group a notification of close. We assume + * the child is a console application, and that it will respond. + * It doesn't seem as though console mode applications that + * don't set a HandlerRoutine acknowledge this. + */ + + if (HasConsole() && pipePtr->numPids) { + GenerateConsoleCtrlEvent(CTRL_C_EVENT, + TclpGetPid(pipePtr->pidPtr[0])); + } + /* * Clean up the background thread if necessary. Note that this * must be done before we can close the file, since the |