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/dcrt0.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'winsup/cygwin/dcrt0.cc') diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index ff75644bd..a56f6281c 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -20,16 +20,16 @@ details. */ #include "sync.h" #include "sigproc.h" #include "pinfo.h" -#include "cygheap.h" #include "heap.h" #include "cygerrno.h" -#include "fhandler.h" -#include "child_info.h" #define NEED_VFORK -#include "perthread.h" #include "perprocess.h" -#include "path.h" +#include "fhandler.h" #include "dtable.h" +#include "cygheap.h" +#include "child_info.h" +#include "path.h" +#include "perthread.h" #include "shared_info.h" #include "cygwin_version.h" #include "dll_init.h" @@ -701,8 +701,7 @@ dll_crt0_1 () __argv = spawn_info->moreinfo->argv; envp = spawn_info->moreinfo->envp; envc = spawn_info->moreinfo->envc; - fdtab.fixup_after_exec (spawn_info->parent, spawn_info->moreinfo->nfds, - spawn_info->moreinfo->fds); + cygheap->fdtab.fixup_after_exec (spawn_info->parent); signal_fixup_after_exec (child_proc_info->type == PROC_SPAWN); CloseHandle (spawn_info->parent); if (spawn_info->moreinfo->old_title) @@ -716,7 +715,6 @@ dll_crt0_1 () cygheap->user.set_sid (NULL); break; } - // fdtab.vfork_child_fixup (); } ProtectHandle (hMainProc); ProtectHandle (hMainThread); @@ -727,6 +725,7 @@ dll_crt0_1 () /* Initialize the cygwin subsystem if this is the first process, or attach to shared data structures if it's already running. */ memory_init (); + cygheap->fdtab.vfork_child_fixup (); (void) SetErrorMode (SEM_FAILCRITICALERRORS); @@ -770,7 +769,7 @@ dll_crt0_1 () if (!old_title && GetConsoleTitle (title_buf, TITLESIZE)) old_title = title_buf; - /* Allocate fdtab */ + /* Allocate cygheap->fdtab */ dtable_init (); /* Initialize uid, gid. */ -- cgit v1.2.3