diff options
| author | Christopher Faylor <me@cgf.cx> | 2008-03-27 04:50:40 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2008-03-27 04:50:40 +0300 |
| commit | 93d606f60aed779c555017828656c8a4e3c9c6a9 (patch) | |
| tree | a1064ee801fa9606f9c06a4dc7f03f79db0314d9 /winsup/cygwin/spawn.cc | |
| parent | 73de02f44b83eeccdacf7b803cc37074660f75b2 (diff) | |
* hookapi.cc (find_first_notloaded_dll): New function.
* pinfo.cc (status_exit): New function. Issue message when dll not found. Use
find_first_notloaded_dll to find a nonexistent dll.
(pinfo::maybe_set_exit_code_from_windows): Call status_exit when exit code >=
0xc0000000UL.
* sigproc.cc (child_info::proc_retry): Return exit code when
STATUS_DLL_NOT_FOUND.
* spawn.cc (spawn_guts): Minor cleanup.
* syscalls.cc (close_all_files): Don't actually close stderr filehandle. Just
make it noninheritable.
* winsup.h (find_first_notloaded_dll): Declare new function.
* ntdll.h: Add several missing NTSTATUS defines.
Diffstat (limited to 'winsup/cygwin/spawn.cc')
| -rw-r--r-- | winsup/cygwin/spawn.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index cb5af8017..2b728b0c4 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -1,7 +1,7 @@ /* spawn.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Red Hat, Inc. + 2005, 2006, 2007, 2008 Red Hat, Inc. This file is part of Cygwin. @@ -265,7 +265,7 @@ do_cleanup (void *args) 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, int __stdin, int __stdout) { bool rc; @@ -745,8 +745,7 @@ loop: myself->wr_proc_pipe_owner = GetCurrentProcessId (); myself->wr_proc_pipe = orig_wr_proc_pipe; } - DWORD res = ch.proc_retry (pi.hProcess); - if (!res) + if (!ch.proc_retry (pi.hProcess)) { looped++; goto loop; |