diff options
author | Christopher Faylor <me@cgf.cx> | 2005-07-05 03:16:46 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-07-05 03:16:46 +0000 |
commit | 2f9ae2ed94384a3df6687545338e363654dd7d8f (patch) | |
tree | 1e3a8d3c5c555b498bb165b66abac6994ea96127 /winsup/cygwin/fhandler_console.cc | |
parent | 26edeb6a7f6c541a25ee7fa4c201b24fea01cc50 (diff) | |
download | cygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.tar.gz cygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.tar.bz2 cygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.zip |
Change foo (void) to foo () for all c++ functions throughout. Remove all
fhandler_*::dump functions throughout.
* fhandler.h (fhandler_dev_mem::close): Remove pass-through function in favor
of virtual method.
(handler_dev_raw::close): Ditto.
(fhandler_dev_clipboard::fixup_after_exec): New method.
* fhandler_dev_mem.cc (fhandler_dev_mem::close): Eliminate pass through
* fhandler_dev_raw.cc (fhandler_dev_raw::close): Ditto.
* fhandler_clipboard.cc (fhandler_dev_clipboard::close): Don't go to extra
effort when execing.
(fhandler_dev_clipboard::fixup_after_exec): New function.
* fhandler_console.cc (fhandler_console::close): Don't do "extra stuff" when we
know we're execing.
* fhandler_disk_file.cc (fhandler_disk_file::close): Ditto.
* fhandler_dsp.cc (fhandler_dev_dsp::close): Ditto.
* fhandler_fifo.cc (fhandler_fifo.cc::close): Ditto. function in favor of base
function.
* fhandler_random.cc (fhandler_dev_random::close): Ditto.
* fhandler_registry.cc (fhandler_registry::close): Ditto.
* fhandler_tty.cc (fhandler_tty_slave::close): Ditto.
* fhandler_virtual.cc (fhandler_virtual::close): Ditto.
* pinfo.cc (proc_waiter): Remove unneeded hExeced declaration.
* sigproc.cc: Ditto.
* winsup.h (hExeced): Define here.
* fhandler_virtual.cc (fhandler_virtual::fixup_after_exec): Just call close()
to reinitialize things to known state.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
-rw-r--r-- | winsup/cygwin/fhandler_console.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 4733c9f0c..3dcea844d 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -688,13 +688,11 @@ fhandler_console::open (int flags, mode_t) } int -fhandler_console::close (void) +fhandler_console::close () { CloseHandle (get_io_handle ()); CloseHandle (get_output_handle ()); - set_io_handle (NULL); - set_output_handle (NULL); - if (--(cygheap->open_fhs) <= 0 && myself->ctty != TTY_CONSOLE) + if (!hExeced && --(cygheap->open_fhs) <= 0 && myself->ctty != TTY_CONSOLE) { syscall_printf ("open_fhs %d", cygheap->open_fhs); FreeConsole (); @@ -1753,7 +1751,7 @@ fhandler_console::init (HANDLE f, DWORD a, mode_t bin) } int -fhandler_console::igncr_enabled (void) +fhandler_console::igncr_enabled () { return tc->ti.c_iflag & IGNCR; } |