diff options
author | Christopher Faylor <me@cgf.cx> | 2005-11-14 07:28:45 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-11-14 07:28:45 +0300 |
commit | 59297e046420341bea04797159ee62b544c2295d (patch) | |
tree | f26e338f090a0a3d33fd3b2d096cdb59738f87c4 /winsup/cygwin/pinfo.cc | |
parent | 70c500b3431209690b9578984785a519572b9514 (diff) |
* cygheap.h (init_cygheap::manage_console_count): Declare new function.
(init_cygheap::console_count): Renamed from open_fhs. Make private.
* cygheap.cc (init_cygheap::manage_console_count): Define new function.
* dtable.cc (dtable::fixup_after_exec): Always call fixup_after_exec on
elements of fd even when they are about to be closed.
* fhandler.h (report_tty_counts): Remove open_fhs from debugging output.
* fhandler_console.cc (fhandler_console::open): Use manage_console_count rather
than manipulating count directly.
(fhandler_console::close): Ditto.
(fhandler_console::fixup_after_fork): Ditto.
(fhandler_console::fixup_after_exec): Ditto. Don't close handles if
close_on_exec.
* fhandler_tty.cc (fhandler_tty_slave::open): Use manage_console_count() rather
than manipulating count directly. Reflect change in arguments to
report_tty_counts().
(fhandler_tty_slave::close): Ditto for both.
(fhandler_tty_slave::dup): Ditto for both.
(fhandler_tty_slave::ioctl): Use myctty() rather than raw ctty #.
(fhandler_tty_slave::fixup_after_fork): Reflect change in arguments to
report_tty_counts().
(fhandler_tty_master::init_console): Use manage_console_count() rather than
manipulating count directly.
* fhandler_clipboard.cc (fhandler_dev_clipboard::fixup_after_exec): Don't
perform any operations if close_on_exec.
* fhandler_dsp.cc (fhandler_dev_dsp::fixup_after_exec): Ditto.
* fhandler_raw.cc (fhandler_dev_raw::fixup_after_exec): Ditto.
* fhandler_serial.cc (fhandler_serial::fixup_after_exec): Ditto.
* pinfo.h (_pinfo::_ctty): Declare new function.
(myctty): Declare new macro.
(__ctty): Declare new macro.
* pinfo.cc (_pinfo::_ctty): Define new function.
(_pinfo::set_ctty): Use manage_console_count() rather than manipulating count
directly.
* signal.cc (kill_pgrp): Use myctty() and __ctty() macros rather than raw ctty
#.
* syscalls.cc (setsid): Ditto. Use manage_console_count() rather than
manipulating count directly.
Diffstat (limited to 'winsup/cygwin/pinfo.cc')
-rw-r--r-- | winsup/cygwin/pinfo.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 098b67e41..7350a00a1 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -315,6 +315,18 @@ pinfo::set_acl() debug_printf ("SetKernelObjectSecurity %E"); } +const char * +_pinfo::_ctty (char *buf) +{ + if (ctty == TTY_CONSOLE) + strcpy (buf, "ctty /dev/console"); + else if (ctty < 0) + strcpy (buf, "no ctty"); + else + __small_sprintf (buf, "ctty /dev/tty%d", ctty); + return buf; +} + void _pinfo::set_ctty (tty_min *tc, int flags, fhandler_tty_slave *arch) { @@ -353,8 +365,8 @@ _pinfo::set_ctty (tty_min *tc, int flags, fhandler_tty_slave *arch) if (arch) { arch->usecount++; - cygheap->open_fhs++; - report_tty_counts (cygheap->ctty, "ctty", "incremented ", ""); + cygheap->manage_console_count ("pinfo::set_ctty", 1); + report_tty_counts (cygheap->ctty, "ctty", ""); } } } |