* child_info.h (child_info_spawn::__stdin): New element.
(child_info_spawn::__stdin): Ditto. (CURR_CHILD_INFO_MAGIC): Regenerate. * dcrt0.cc (check_sanity_and_sync): Minor cleanup. (child_info_spawn::handle_spawn): Handle new __std* elements by calling move_fd. * dtable.cc (dtable::move_fd): Define new function. * dtable.h (dtable::move_fd): Declare new function. * fhandler.h (fhandler_pipe::popen_pid): Declare new element. * fhandler.h (fhandler_pipe::get_popen_pid): Define new function. * fhandler.h (fhandler_pipe::set_popen_pid): Ditto. * pipe.cc (fhandler_pipe::fhandler_pipe): Zero popen_pid. (fhandler_pipe::dup): Ditto. * spawn.cc (handle): Change second argument to bool. (spawn_guts): Accept __stdin/__stdout arguments and set them appropriately in child_info structure and in STARTUPINFO structure. * syscalls.cc (popen): New cygwin-specific implementation using spawn. (pclose): Ditto. * winsup.h (spawn_guts): Accommodate new arguments for spawn_guts. * fhandler.cc (fhandler_base::set_no_inheritance): Make second arg a bool. * fhandler.h (fhandler_base::set_no_inheritance): Ditto for declaration. * child_info.h (child_info::msv_count): Rename from the now-inappropriate "zero". (child_info_spawn::filler): Add filler to work around Vista bug. (child_info_fork::filler): Ditto. * dcrt0.cc (get_cygwin_startup_info): Remove "zero" check since it is now always filled out. * fork.cc (frok::parent): Move ch.zero manipulation to constructor. * spawn.cc (spawn_guts): Ditto. Remove _ch wrapper. * sigproc.cc (child_info::child_info): Initialize starter[]. * shared.cc (shared_info::heap_slop_size): Remove noisy system_printfs. * shared_info.h (CURR_SHARED_MAGIC): Regenerate.
This commit is contained in:
@@ -23,7 +23,6 @@ enum child_status
|
||||
_CI_STRACED = 0x01,
|
||||
_CI_ISCYGWIN = 0x02,
|
||||
_CI_SAW_CTRL_C = 0x04
|
||||
|
||||
};
|
||||
|
||||
#define OPROC_MAGIC_MASK 0xff00ff00
|
||||
@@ -38,7 +37,7 @@ enum child_status
|
||||
#define EXEC_MAGIC_SIZE sizeof(child_info)
|
||||
|
||||
/* Change this value if you get a message indicating that it is out-of-sync. */
|
||||
#define CURR_CHILD_INFO_MAGIC 0x3a24db6aU
|
||||
#define CURR_CHILD_INFO_MAGIC 0x3ebda16aU
|
||||
|
||||
/* NOTE: Do not make gratuitous changes to the names or organization of the
|
||||
below class. The layout is checksummed to determine compatibility between
|
||||
@@ -46,7 +45,7 @@ enum child_status
|
||||
class child_info
|
||||
{
|
||||
public:
|
||||
DWORD zero[4]; // must be zeroed
|
||||
DWORD msv_count; // zeroed on < W2K3, set to pseudo-count on Vista
|
||||
DWORD cb; // size of this record
|
||||
DWORD intro; // improbable string
|
||||
unsigned long magic; // magic number unique to child_info
|
||||
@@ -85,6 +84,7 @@ public:
|
||||
jmp_buf jmp; // where child will jump to
|
||||
void *stacktop; // location of top of parent stack
|
||||
void *stackbottom; // location of bottom of parent stack
|
||||
char filler[4];
|
||||
child_info_fork ();
|
||||
void handle_fork () __attribute__ ((regparm (1)));;
|
||||
bool handle_failure (DWORD) __attribute__ ((regparm (2)));
|
||||
@@ -109,6 +109,9 @@ class child_info_spawn: public child_info
|
||||
{
|
||||
public:
|
||||
cygheap_exec_info *moreinfo;
|
||||
int __stdin;
|
||||
int __stdout;
|
||||
char filler[4];
|
||||
|
||||
~child_info_spawn ()
|
||||
{
|
||||
|
Reference in New Issue
Block a user