diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-05-22 08:50:54 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-05-22 08:50:54 +0400 |
| commit | 6813f009ba2a95c9476e29fe356d2e3b46286efb (patch) | |
| tree | 073ccf527cf9cb193ce1094b079bbfdba8687657 /winsup/cygwin/child_info.h | |
| parent | 8ae1d98d8ee2a0e0813d32aa42f2e584f99d17bf (diff) | |
* child_info.h (_CI_SAW_CTRL_C): New enum.
(CURR_CHILD_INFO_MAGIC): Reset.
(saw_ctrl_c): New function.
(set_saw_ctrl_c): Ditto.
* sigproc.cc (child_info::proc_retry): Return EXITCODE_OK if we get
STATUS_CONTROL_C_EXIT and we actually saw a CTRL-C.
* spawn.cc (dwExeced): Delete.
(chExeced): New variable.
(spawn_guts): Set chExeced;
* exceptions.cc (dwExeced): Delete declaration.
(chExeced): Declare.
(ctrl_c_handler): Detect if we're an exec stub process and set a flag, if so.
* fhandler_tty.cc (fhandler_tty_common::__release_output_mutex): Add extra
DEBUGGING test.
* pinfo.cc: Fix comment.
Diffstat (limited to 'winsup/cygwin/child_info.h')
| -rw-r--r-- | winsup/cygwin/child_info.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h index 4d0ea0195..7f1a88c17 100644 --- a/winsup/cygwin/child_info.h +++ b/winsup/cygwin/child_info.h @@ -20,8 +20,10 @@ enum child_info_types enum child_status { - _CI_STRACED = 0x01, - _CI_ISCYGWIN = 0x02 + _CI_STRACED = 0x01, + _CI_ISCYGWIN = 0x02, + _CI_SAW_CTRL_C = 0x04 + }; #define OPROC_MAGIC_MASK 0xff00ff00 @@ -36,7 +38,7 @@ enum child_status #define EXEC_MAGIC_SIZE sizeof(child_info) /* Change this value if you get a message indicating that it is out-of-sync. */ -#define CURR_CHILD_INFO_MAGIC 0x110015eaU +#define CURR_CHILD_INFO_MAGIC 0x704d1f7eU /* NOTE: Do not make gratuitous changes to the names or organization of the below class. The layout is checksummed to determine compatibility between @@ -68,6 +70,8 @@ public: DWORD proc_retry (HANDLE) __attribute__ ((regparm (2))); bool isstraced () const {return !!(flag & _CI_STRACED);} bool iscygwin () const {return !!(flag & _CI_ISCYGWIN);} + bool saw_ctrl_c () const {return !!(flag & _CI_SAW_CTRL_C);} + void set_saw_ctrl_c () {flag |= _CI_SAW_CTRL_C;} }; class mount_info; |