diff options
author | Christopher Faylor <me@cgf.cx> | 2011-06-01 01:47:51 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2011-06-01 01:47:51 +0000 |
commit | 83e4d35a89d8d1c0e55e980263fffe6c65d2a2eb (patch) | |
tree | 1a285a0f18653b2cfbc305b42eaf332e6ec33757 /winsup/cygwin/exceptions.cc | |
parent | be9b5aba2693adef4a1018d695baa6cb32afd441 (diff) | |
download | cygnal-83e4d35a89d8d1c0e55e980263fffe6c65d2a2eb.tar.gz cygnal-83e4d35a89d8d1c0e55e980263fffe6c65d2a2eb.tar.bz2 cygnal-83e4d35a89d8d1c0e55e980263fffe6c65d2a2eb.zip |
* exceptions.cc (ctrl_c_handler): Simplify test for no parent tty.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Return NULL if ctty is
not tty/console. Improve test for slave tty/pty device.
Diffstat (limited to 'winsup/cygwin/exceptions.cc')
-rw-r--r-- | winsup/cygwin/exceptions.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index 1c96b61a7..756a5f037 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -999,7 +999,7 @@ ctrl_c_handler (DWORD type) tty_min *t = cygwin_shared->tty.get_cttyp (); /* Ignore this if we're not the process group leader since it should be handled *by* the process group leader. */ - if (myself->ctty != -1 && t->getpgid () == myself->pid && + if (t && t->getpgid () == myself->pid && (GetTickCount () - t->last_ctrl_c) >= MIN_CTRL_C_SLOP) /* Otherwise we just send a SIGINT to the process group and return TRUE (to indicate that we have handled the signal). At this point, type should be |