* exceptions.cc: (ctrl_c_handler): Do nothing while a Cygwin subprocess is
starting. * child_info.h (init_child_info): Remove pid argument from declaration. * cygheap.h (init_cygheap::pid): New element. * dcrt0.cc (dll_crt0_0): Eliminate handling of now-noexistent cygpid parameter in child_info struct. Set forkee to 'true' rather than cygpid since the pid value was never used. (dll_crt0_1): Ditto. (_dll_crt0): Ditto. * fork.cc (fork_child): Don't wait for sigthread. This is handled in the fork call now. (fork_parent): Remove obsolete pid argument from init_child_info call. Don't do anything special with cygpid when DEBUGGING. (fork): Delay all signals during fork. (fork_init): Don't do anything special when DEBUGGING. * pinfo.cc (set_myself): Remove pid parameter. Use new pid field in cygheap. (pinfo_init): Don't pass pid argument to set_myself. * sigproc.cc (sig_send): Wait for dwProcessId to be non-zero as well as sendsig. (init_child_info): Eliminate handling of pid. (wait_sig): Implement method to temporarily hold off sending signals. * sigproc.h (__SIGHOLD): New enum. (__SIGNOHOLD): Ditto. * spawn.cc (spawn_guts): Remove obsolete pid argument from init_child_info call.
This commit is contained in:
@@ -393,8 +393,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
|
||||
ProtectHandleINH (subproc_ready);
|
||||
}
|
||||
|
||||
init_child_info (chtype, &ciresrv, (mode == _P_OVERLAY) ? myself->pid : 1,
|
||||
subproc_ready);
|
||||
init_child_info (chtype, &ciresrv, subproc_ready);
|
||||
|
||||
ciresrv.moreinfo = (cygheap_exec_info *) ccalloc (HEAP_1_EXEC, 1, sizeof (cygheap_exec_info));
|
||||
ciresrv.moreinfo->old_title = NULL;
|
||||
@@ -630,6 +629,10 @@ spawn_guts (const char * prog_arg, const char *const *argv,
|
||||
flags |= DETACHED_PROCESS;
|
||||
if (mode != _P_OVERLAY)
|
||||
flags |= CREATE_SUSPENDED;
|
||||
#if 0 //someday
|
||||
else
|
||||
myself->dwProcessId = 0;
|
||||
#endif
|
||||
|
||||
/* Some file types (currently only sockets) need extra effort in the
|
||||
parent after CreateProcess and before copying the datastructures
|
||||
@@ -638,7 +641,6 @@ spawn_guts (const char * prog_arg, const char *const *argv,
|
||||
if (cygheap->fdtab.need_fixup_before ())
|
||||
flags |= CREATE_SUSPENDED;
|
||||
|
||||
|
||||
const char *runpath = null_app_name ? NULL : (const char *) real_path;
|
||||
|
||||
syscall_printf ("null_app_name %d (%s, %.9500s)", null_app_name, runpath, one_line.buf);
|
||||
@@ -649,6 +651,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
|
||||
|
||||
cygheap->fdtab.set_file_pointers_for_exec ();
|
||||
cygheap->user.deimpersonate ();
|
||||
|
||||
/* When ruid != euid we create the new process under the current original
|
||||
account and impersonate in child, this way maintaining the different
|
||||
effective vs. real ids.
|
||||
@@ -729,6 +732,10 @@ spawn_guts (const char * prog_arg, const char *const *argv,
|
||||
{
|
||||
__seterrno ();
|
||||
syscall_printf ("CreateProcess failed, %E");
|
||||
#if 0 // someday
|
||||
if (mode == _P_OVERLAY)
|
||||
myself->dwProcessId = GetCurrentProcessId ();
|
||||
#endif
|
||||
if (subproc_ready)
|
||||
ForceCloseHandle (subproc_ready);
|
||||
cygheap_setup_for_child_cleanup (newheap, &ciresrv, 0);
|
||||
|
Reference in New Issue
Block a user