diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-22 17:09:46 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-22 17:09:46 +0000 |
| commit | eef57fe1e33dddda8840188a62365393a683fb54 (patch) | |
| tree | d18a3434852a51c8548e6ab26c029d4bb6435aab /winsup/cygwin/fhandler.cc | |
| parent | 64f211c87c2fcbc26abc091a5545643ebd129f4d (diff) | |
| download | cygnal-eef57fe1e33dddda8840188a62365393a683fb54.tar.gz cygnal-eef57fe1e33dddda8840188a62365393a683fb54.tar.bz2 cygnal-eef57fe1e33dddda8840188a62365393a683fb54.zip | |
* fhandler.cc (fhandler_base::set_no_inheritance): Always use
SetHandleInformation.
* fhandler_disk_file.cc (fhandler_disk_file::lock): Always use
UnlockFileEx/LockFileEx functions.
* net.cc (fdsock): Don't bother to duplicate socket for inheritance.
* sysconf.cc (get_nproc_values): Take NT for granted.
(get_avphys): Ditto.
* syslog.cc (WIN95_EVENT_LOG_PATH): Remove define.
(get_win95_event_log_path): Remove.
(vsyslog): Fix formatting. Take NT for granted.
* wincap.cc: Remove has_lock_file_ex, has_signal_object_and_wait,
has_eventlog, has_set_handle_information,
has_set_handle_information_on_console_handles and supports_smp
throughout.
* wincap.h: Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 572be2a17..6558e5625 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1481,21 +1481,9 @@ fhandler_dev_null::open (int flags, mode_t mode) void fhandler_base::set_no_inheritance (HANDLE &h, bool not_inheriting) { - if (wincap.has_set_handle_information ()) - { - if (!SetHandleInformation (h, HANDLE_FLAG_INHERIT, not_inheriting ? 0 : HANDLE_FLAG_INHERIT)) - debug_printf ("SetHandleInformation failed, %E"); - } - else - { - HANDLE oh = h; - if (!DuplicateHandle (hMainProc, oh, hMainProc, &h, 0, !not_inheriting, - DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) - debug_printf ("DuplicateHandle failed, %E"); - - if (oh != h) - VerifyHandle (h); - } + if (!SetHandleInformation (h, HANDLE_FLAG_INHERIT, + not_inheriting ? 0 : HANDLE_FLAG_INHERIT)) + debug_printf ("SetHandleInformation failed, %E"); #ifdef DEBUGGING_AND_FDS_PROTECTED if (h) setclexec (oh, h, not_inheriting); |