JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* spawn.cc (spawn_guts): Change type back to 'int' after erroneous change

Browse Source 
below.
This commit is contained in:
Christopher Faylor 2003-12-08 00:21:17 +00:00
parent 2e008fb91f
commit 1c5c9a6bfb
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-07 Christopher Faylor <cgf@redhat.com>
* spawn.cc (spawn_guts): Change type back to 'int' after erroneous
change below.
2003-12-07 Christopher Faylor <cgf@redhat.com> 2003-12-07 Christopher Faylor <cgf@redhat.com>
Change use of BOOL, TRUE, FALSE to bool, true, false, as appropriate, Change use of BOOL, TRUE, FALSE to bool, true, false, as appropriate,

18
winsup/cygwin/fhandler_tty.cc
View File

@ -1306,15 +1306,6 @@ fhandler_pty_master::ptsname ()
void void
fhandler_tty_common::set_close_on_exec (int val) fhandler_tty_common::set_close_on_exec (int val)
{ {
#ifndef DEBUGGING
fhandler_base::set_close_on_exec (val);
#else
/* FIXME: This is a duplication from fhandler_base::set_close_on_exec.
It is here because we need to specify the "from_pty" stuff here or
we'll get warnings from ForceCloseHandle when debugging. */
set_inheritance (get_io_handle (), val);
set_close_on_exec_flag (val);
#endif
if (get_major () == DEV_TTYS_MAJOR if (get_major () == DEV_TTYS_MAJOR
&& get_io_handle () == cygheap->ctty.get_io_handle ()) && get_io_handle () == cygheap->ctty.get_io_handle ())
set_close_on_exec_flag (val); set_close_on_exec_flag (val);
@ -1332,6 +1323,15 @@ fhandler_tty_common::set_close_on_exec (int val)
set_inheritance (input_mutex, val); set_inheritance (input_mutex, val);
set_inheritance (input_available_event, val); set_inheritance (input_available_event, val);
set_inheritance (output_handle, val); set_inheritance (output_handle, val);
#ifndef DEBUGGING
fhandler_base::set_close_on_exec (val);
#else
/* FIXME: This is a duplication from fhandler_base::set_close_on_exec.
It is here because we need to specify the "from_pty" stuff here or
we'll get warnings from ForceCloseHandle when debugging. */
set_inheritance (get_io_handle (), val);
set_close_on_exec_flag (val);
#endif
} }
} }

2
winsup/cygwin/spawn.cc
View File

@ -345,7 +345,7 @@ do_cleanup (void *args)
} }
static bool __stdcall static int __stdcall
spawn_guts (const char * prog_arg, const char *const *argv, spawn_guts (const char * prog_arg, const char *const *argv,
const char *const envp[], int mode) const char *const envp[], int mode)
{ {

7
winsup/cygwin/wait.cc
View File

@ -48,14 +48,13 @@ wait4 (int intpid, int *status, int options, struct rusage *r)
int res; int res;
waitq *w; waitq *w;
HANDLE waitfor; HANDLE waitfor;
bool sawsig;
pthread_testcancel (); pthread_testcancel ();
while (1) while (1)
{ {
sig_dispatch_pending (); sig_dispatch_pending ();
sawsig = 0; bool sawsig = false;
if (options & ~(WNOHANG | WUNTRACED)) if (options & ~(WNOHANG | WUNTRACED))
{ {
set_errno (EINVAL); set_errno (EINVAL);
@ -73,7 +72,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r)
w->rusage = r; w->rusage = r;
sigproc_printf ("calling proc_subproc, pid %d, options %d", sigproc_printf ("calling proc_subproc, pid %d, options %d",
w->pid, w->options); w->pid, w->options);
if (!proc_subproc (PROC_WAIT, (DWORD)w)) if (!proc_subproc (PROC_WAIT, (DWORD) w))
{ {
set_errno (ENOSYS); set_errno (ENOSYS);
paranoid_printf ("proc_subproc returned 0"); paranoid_printf ("proc_subproc returned 0");
@ -101,7 +100,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r)
{ {
call_signal_handler_now (); call_signal_handler_now ();
set_sig_errno (EINTR); set_sig_errno (EINTR);
sawsig = 1; sawsig = true;
res = -1; res = -1;
} }
else if (res != WAIT_OBJECT_0) else if (res != WAIT_OBJECT_0)