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/syscalls.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/syscalls.cc')
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 162825442..4ab14471f 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1134,7 +1134,7 @@ open (const char *unix_path, int flags, ...) a change in behavior that implements linux functionality: opening a tty should not automatically cause it to become the controlling tty for the process. */ - if (fd > 2) + if (0 && fd > 2) flags |= O_NOCTTY; if (!(fh = build_fh_name (unix_path, (flags & (O_NOFOLLOW | O_EXCL)) @@ -1600,9 +1600,10 @@ stat_worker (path_conv &pc, struct __stat64 *buf) if (!buf->st_ino) buf->st_ino = fh->get_ino (); if (!buf->st_dev) - buf->st_dev = fh->get_device (); + buf->st_dev = fh->is_dev_tty () ? FH_TTY : fh->get_device (); if (!buf->st_rdev) buf->st_rdev = buf->st_dev; +debug_printf ("is_dev_tty %d, st_dev %p\n", fh->is_dev_tty (), buf->st_dev); } delete fh; } |