diff options
author | Christopher Faylor <me@cgf.cx> | 2011-10-12 03:20:38 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2011-10-12 03:20:38 +0400 |
commit | 4add6f8db15841278eac9e5bd90f7361881ab226 (patch) | |
tree | bd738ee900b7d99aa2909c08e7f2469f9ca35c0a /winsup/cygwin/fhandler_tty.cc | |
parent | 14b9008cca69dc6aaa2dec9954d8687437a25fbb (diff) |
* cygwin.din: Remove some _tc* exports. Add tcgetsid().
* dtable.cc (fh_alloc): Revert ill-advised setting of major/minor. Use new
is_dev_tty to remember that this device was opened as /dev/tty.
* fhandler.cc (fhandler_base::fstat): Remove leftover debugging statement.
(fhandler_base::tcgetsid): New function.
* fhandler.h ((fhandler_base::tcgetsid): Declare new function.
(fhandler_base::is_dev_tty): Ditto.
(fhandler_termios::opened_as_dev_tty): Declare new field.
(fhandler_termios::is_dev_tty): Declare new function.
(fhandler_termios::tcgetsid): Ditto.
(fhandler_pty_common::use_archetype): Move here from subclass.
(fhandler_pty_slave::use_archetype): Move up.
(fhandler_pty_master::use_archetype): Ditto.
* fhandler_console.cc (fhandler_console::ioctl): Rename second argument from
`buf' to `arg' for consistency. Call ioctl_termios for common fhandler_termios
ioctl handling.
* fhandler_tty.cc (fhandler_pty_slave::ioctl): Call ioctl_termios for common
fhandler_termios ioctl handling.
(fhandler_pty_master::ioctl): Ditto.
* fhandler_termios.cc (fhandler_termios::tcgetsid): Implement new function.
(fhandler_termios::ioctl_termios): Ditto. Implements TIOCSCTTY handling.
* syscalls.cc (stat_worker): Set /dev/tty device info when appropriate.
* termios.cc (tcgetpgrp): Avoid extraneous "isatty" check.
(tcgetsid): Implement new function.
* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 253.
* include/sys/termios.h (TIOCSCTTY): Define.
Diffstat (limited to 'winsup/cygwin/fhandler_tty.cc')
-rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 0d16130be..d5ebec94a 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -145,7 +145,7 @@ fhandler_pty_master::accept_input () rc = WriteFile (get_output_handle (), p, bytes_left, &written, NULL); if (!rc) { - debug_printf ("error writing to pipe %E"); + debug_printf ("error writing to pipe %p %E", get_output_handle ()); get_ttyp ()->read_retval = -1; ret = -1; } @@ -947,6 +947,9 @@ int fhandler_pty_slave::ioctl (unsigned int cmd, void *arg) { termios_printf ("ioctl (%x)", cmd); + int res = ioctl_termios (cmd, (int) arg); + if (res <= 0) + return res; if (myself->pgid && get_ttyp ()->getpgid () != myself->pgid && (unsigned) myself->ctty == FHDEV (DEV_TTYS_MAJOR, get_unit ()) @@ -1358,6 +1361,10 @@ fhandler_pty_master::tcflush (int queue) int fhandler_pty_master::ioctl (unsigned int cmd, void *arg) { + int res = ioctl_termios (cmd, (int) arg); + if (res <= 0) + return res; + switch (cmd) { case TIOCPKT: |