From 0381fec68f46471d29d3b87c5361e05fcdeb2cd5 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 18 Apr 2001 21:10:15 +0000 Subject: Throughout, change fdtab references to cygheap->fdtab. * child_info.h (cygheap_exec_info): Eliminate special fdtab stuff. * spawn.cc (spawn_guts): Ditto. * cygheap.cc (cygheap_init): Initialize fdtab, if appropriate. * cygheap.h (CYGHEAPSIZE): Include size of init_cygheap. (_cmalloc_entry): Include fdtab here. * dtable.h (dtable): Declare/define new methods. * dtable.cc (dtable::vfork_child_fixup): New method. (dtable::fixup_after_exec): Remove unneeded extra arguments. * dcrt0.cc (dll_crt0_1): Ditto. * environ.cc (getwinenv): Use case sensitive comparison. (winenv): Make a copy of environment cache to avoid realloc problems when duplicate environment variables exist in the environment. (From Egor Duda) * net.cc (cygwin_socket): Revert Apr 14 change. * include/sys/file.h: Protect against previous X_OK definition. * passwd.cc: Eliminate passwd_sem throughout. * security.cc: Ditto. * cygwin.din: Export New functions. * passwd.cc (read_etc_passwd): Make race safe. (getpwuid_r): New function. (getpwnam_r): New function. --- winsup/cygwin/dtable.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/dtable.h') diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/dtable.h index 9ec6dfae6..b67cfbcc1 100644 --- a/winsup/cygwin/dtable.h +++ b/winsup/cygwin/dtable.h @@ -21,6 +21,7 @@ public: size_t size; dtable () : first_fd_for_open(3), cnt_need_fixup_before(0) {} + void init () {first_fd_for_open = 3;} void dec_need_fixup_before () { if (cnt_need_fixup_before > 0) --cnt_need_fixup_before; } @@ -31,6 +32,7 @@ public: int vfork_child_dup (); void vfork_parent_restore (); + void vfork_child_fixup (); fhandler_base *dup_worker (fhandler_base *oldfh); int extend (int howmuch); void fixup_before_exec (DWORD win_proc_id); @@ -45,7 +47,7 @@ public: void release (int fd); void init_std_file_from_handle (int fd, HANDLE handle, DWORD access, const char *name); int dup2 (int oldfd, int newfd); - void fixup_after_exec (HANDLE, size_t, fhandler_base **); + void fixup_after_exec (HANDLE); inline fhandler_base *operator [](int fd) { return fds[fd]; } select_record *select_read (int fd, select_record *s); select_record *select_write (int fd, select_record *s); -- cgit v1.2.3