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/fork.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/fork.cc') diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index de85c1d96..646dbee58 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -274,7 +274,7 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls) MALLOC_CHECK; pinfo_fixup_after_fork (); - fdtab.fixup_after_fork (hParent); + cygheap->fdtab.fixup_after_fork (hParent); signal_fixup_after_fork (); MALLOC_CHECK; @@ -377,7 +377,7 @@ fork_parent (void *stack_here, HANDLE& hParent, dll *&first_dll, parent after CreateProcess and before copying the datastructures to the child. So we have to start the child in suspend state, unfortunately, to avoid a race condition. */ - if (fdtab.need_fixup_before ()) + if (cygheap->fdtab.need_fixup_before ()) c_flags |= CREATE_SUSPENDED; /* Create an inheritable handle to pass to the child process. This will @@ -490,9 +490,9 @@ out: /* Fixup the parent datastructure if needed and resume the child's main thread. */ - if (fdtab.need_fixup_before ()) + if (cygheap->fdtab.need_fixup_before ()) { - fdtab.fixup_before_fork (pi.dwProcessId); + cygheap->fdtab.fixup_before_fork (pi.dwProcessId); ResumeThread (pi.hThread); } @@ -708,10 +708,10 @@ vfork () for (pp = (char **)vf->frame, esp = vf->vfork_esp; esp <= vf->vfork_ebp + 1; pp++, esp++) *pp = *esp; - return fdtab.vfork_child_dup () ? 0 : -1; + return cygheap->fdtab.vfork_child_dup () ? 0 : -1; } - fdtab.vfork_parent_restore (); + cygheap->fdtab.vfork_parent_restore (); vf = get_vfork_val (); if (vf->pid < 0) -- cgit v1.2.3