* dtable.cc (set_std_handle): Use std_consts array to control SetStdHandle
settings. (dtable::fixup_after_fork): Ditto. * exceptions.cc (set_sig_errno): Remove some debugging output. * path.cc (path_conv::check): Don't OR need_directory with flags sent to symlink_info::check. (symlink_info::check): Use PATH_ALL_EXEC to determine when a file is executable. * path.h (path_types): Add PATH_ALL_EXEC. (isexec): Use PATH_ALL_EXEC so that cygexec types will be considered executable. * pinfo.h (_pinfo): Add a process handle that is kept open throughout the life of a cygwin pid. * sigproc.cc (proc_exists): Remove hopefully obsolete stuff. (proc_subproc): Set up process handle that is kept open throughout the life of a cygwin pid. Reorganize PROC_WAIT stuff to use common code. (proc_terminate): Close pid lifetime process handle. (checkstate): Cleanup. (stopped_or_terminated): Move zombie cleanup. (remove_zombie): To here. * spawn.cc (spawn_guts): Reorganize reparenting code for 1247th time.
This commit is contained in:
@ -33,6 +33,9 @@ details. */
|
||||
|
||||
dtable fdtab;
|
||||
|
||||
static DWORD std_consts[] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
|
||||
STD_ERROR_HANDLE};
|
||||
|
||||
/* Set aside space for the table of fds */
|
||||
void
|
||||
dtable_init (void)
|
||||
@ -45,11 +48,9 @@ void __stdcall
|
||||
set_std_handle (int fd)
|
||||
{
|
||||
if (fd == 0)
|
||||
SetStdHandle (STD_INPUT_HANDLE, fdtab[fd]->get_handle ());
|
||||
else if (fd == 1)
|
||||
SetStdHandle (STD_OUTPUT_HANDLE, fdtab[fd]->get_output_handle ());
|
||||
else if (fd == 2)
|
||||
SetStdHandle (STD_ERROR_HANDLE, fdtab[fd]->get_output_handle ());
|
||||
SetStdHandle (std_consts[fd], fdtab[fd]->get_handle ());
|
||||
else if (fd <= 2)
|
||||
SetStdHandle (std_consts[fd], fdtab[fd]->get_output_handle ());
|
||||
}
|
||||
|
||||
int
|
||||
@ -453,7 +454,13 @@ dtable::fixup_after_exec (HANDLE parent, size_t sz, fhandler_base **f)
|
||||
if (fds[i]->get_close_on_exec ())
|
||||
release (i);
|
||||
else
|
||||
fds[i]->fixup_after_exec (parent);
|
||||
{
|
||||
fds[i]->fixup_after_exec (parent);
|
||||
if (i == 0)
|
||||
SetStdHandle (std_consts[i], fds[i]->get_io_handle ());
|
||||
else if (i <= 2)
|
||||
SetStdHandle (std_consts[i], fds[i]->get_output_handle ());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user