* fhandler_console.cc (fhandler_console::input_tcsetattr): Revert

prevois patch.
	(fhandler_console::open_setup): Install Ctrl-C handler here, if this
	console is the controlling tty and the process hasn't been started by
	a Cygwin process.
This commit is contained in:
Corinna Vinschen 2012-03-02 11:56:06 +00:00
parent bfeed1643e
commit 109bc58303
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2012-03-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler_console.cc (fhandler_console::input_tcsetattr): Revert
prevois patch.
(fhandler_console::open_setup): Install Ctrl-C handler here, if this
console is the controlling tty and the process hasn't been started by
a Cygwin process.
2012-03-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler_console.cc (fhandler_console::input_tcsetattr): Set the

View File

@ -828,7 +828,8 @@ void
fhandler_console::open_setup (int flags)
{
set_flags ((flags & ~O_TEXT) | O_BINARY);
myself->set_ctty (this, flags);
if (myself->set_ctty (this, flags) && !myself->cygstarted)
init_console_handler (true);
}
int
@ -1009,9 +1010,6 @@ fhandler_console::input_tcsetattr (int, struct termios const *t)
res = SetConsoleMode (get_io_handle (), flags) ? 0 : -1;
if (res < 0)
__seterrno ();
else
/* Set state of ctrl_c handler depending on ENABLE_PROCESSED_INPUT. */
init_console_handler (flags & ENABLE_PROCESSED_INPUT);
syscall_printf ("%d = tcsetattr(,%x) enable flags %p, c_lflag %p iflag %p",
res, t, flags, t->c_lflag, t->c_iflag);
}