diff options
author | Christopher Faylor <me@cgf.cx> | 2001-04-18 21:10:15 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-04-18 21:10:15 +0000 |
commit | 0381fec68f46471d29d3b87c5361e05fcdeb2cd5 (patch) | |
tree | 718cfaf2d3d8734c48f8957892329c0e8fc2fbfc /winsup/cygwin/spawn.cc | |
parent | a2d47fe9d983ec85075172211172af9e5ab4054f (diff) | |
download | cygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.tar.gz cygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.tar.bz2 cygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.zip |
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.
Diffstat (limited to 'winsup/cygwin/spawn.cc')
-rw-r--r-- | winsup/cygwin/spawn.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 3fb5abe1b..5ac823c8d 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -151,7 +151,7 @@ out: static HANDLE handle (int n, int direction) { - fhandler_base *fh = fdtab[n]; + fhandler_base *fh = cygheap->fdtab[n]; if (!fh) return INVALID_HANDLE_VALUE; @@ -340,8 +340,6 @@ spawn_guts (HANDLE hToken, const char * prog_arg, const char *const *argv, ciresrv.moreinfo = (cygheap_exec_info *) ccalloc (HEAP_1_EXEC, 1, sizeof (cygheap_exec_info)); ciresrv.moreinfo->old_title = NULL; - ciresrv.moreinfo->fds = fdtab; - ciresrv.moreinfo->nfds = fdtab.size; /* CreateProcess takes one long string that is the command line (sigh). We need to quote any argument that has whitespace or embedded "'s. */ @@ -563,7 +561,7 @@ skip_arg_parsing: 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 ()) flags |= CREATE_SUSPENDED; @@ -690,9 +688,9 @@ skip_arg_parsing: /* 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_exec (pi.dwProcessId); + cygheap->fdtab.fixup_before_exec (pi.dwProcessId); if (mode == _P_OVERLAY) ResumeThread (pi.hThread); } |