From 2e008fb91f34b5a257305a1e9e42f60fb0aef81d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 7 Dec 2003 22:37:12 +0000 Subject: Change use of BOOL, TRUE, FALSE to bool, true, false, as appropriate, throughout. * tty.cc (tty::common_init): Remove call to SetKernelObjectSecurity and edit some comments. * cygheap.h (init_cygheap::ctty): Add new element. * devices.in (device::parse): Remove special handling for /dev/tty. * devices.cc: Regenerate. * dtable.cc (build_fh_pc): Don't reset /dev/tty device. Let the device opener do that. * fhandler_termios.cc (tty_min::set_ctty): Redefine to _pinfo class. * fhandler_tty.cc (fhandler_tty_common::set_close_on_exec): Avoid setting noninherit flag for ctty. * tty.h: Move BOOLs to bools. (tty_min::set_ctty): Redeclare to _pinfo class. * pinfo.cc (_pinfo::set_ctty): Define new function based on tty_min::set_ctty. Change first argument from tty number to tty_min class. * pinfo.h (_pinfo::set_ctty): Declare. * fhandler_console.cc (fhandler_console::get_tty_stuff): Reflect move of set_ctty to _pinfo class. * fhandler_tty.cc (fhandler_tty_slave::open): Treat FH_TTY specially. Use saved cygheap value if it exists. Otherwise convert to real device and save on first time open. (fhandler_tty_common::dup): Potentially set controlling tty if duping a slave tty. * syscalls.cc (setsid): Close controlling tty in cygheap. * tty.cc: Change some BOOLs to bools. --- winsup/cygwin/dtable.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'winsup/cygwin/dtable.cc') diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 27c543fa4..e3268ed69 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -408,17 +408,11 @@ build_fh_pc (path_conv& pc) break; case FH_TTY: { - device newdev = pc.dev; - newdev.tty_to_real_device (); - switch (newdev) - { - case FH_CONSOLE: - fh = cnew (fhandler_console) (); - break; - case FH_TTYS: - fh = cnew (fhandler_tty_slave) (); - break; - } + if (myself->ctty == TTY_CONSOLE) + fh = cnew (fhandler_console) (); + else if (myself->ctty >= 0) + fh = cnew (fhandler_tty_slave) (); + break; } } } -- cgit v1.2.3