From 7d9826436bef9d6d6f3f974270e440138836b560 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 3 Mar 2003 03:59:38 +0000 Subject: merge from trunk --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_console.cc | 3 ++- winsup/cygwin/syscalls.cc | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f81173f33c0..f1afd945353 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2003-03-02 Christopher Faylor + + * fhandler_console.cc (fhandler_console::close): Don't decrement + in use counter if in vfork fixup stage. + 2003-03-02 Christopher Faylor * lib/getopt.c: Nuke use of unneeded BSDisms. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 5b220f6fd28..90edae6951e 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -647,7 +647,8 @@ fhandler_console::close (void) CloseHandle (get_output_handle ()); set_io_handle (NULL); set_output_handle (NULL); - if (--open_fhs <= 0 && myself->ctty != FH_CONSOLE) + if (!cygheap->fdtab.in_vfork_cleanup () && --open_fhs <= 0 + && myself->ctty != FH_CONSOLE) FreeConsole (); debug_printf ("decremented open_fhs, now %d", open_fhs); return 0; diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 1ec38d09fd8..ba2d9580ed0 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1973,12 +1973,6 @@ mknod_worker (const char *path, mode_t type, mode_t mode, _major_t major, return symlink_worker (buf, path, true, true); } -/* mknod was the call to create directories before the introduction - of mkdir in 4.2BSD and SVR3. Use of mknod required superuser privs - so the mkdir command had to be setuid root. - Although mknod hasn't been implemented yet, some GNU tools (e.g. the - fileutils) assume its existence so we must provide a stub that always - fails. */ extern "C" int mknod (const char *path, mode_t mode, dev_t dev) { -- cgit v1.2.1