/* Waiting for a subprocess to finish.
- Copyright (C) 2001-2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "wait-process.h"
#endif
#include "error.h"
-#include "exit.h"
#include "fatal-signal.h"
#include "xalloc.h"
#include "gettext.h"
#if defined _MSC_VER || defined __MINGW32__
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
/* The return value of spawnvp() is really a process handle as returned
by CreateProcess(). Therefore we can kill it using TerminateProcess. */
#define kill(pid,sig) TerminateProcess ((HANDLE) (pid), sig)
/* The cleanup action. It gets called asynchronously. */
static void
-cleanup_slaves ()
+cleanup_slaves (void)
{
for (;;)
{
slaves_entry_t *old_slaves = slaves;
size_t new_slaves_allocated = 2 * slaves_allocated;
slaves_entry_t *new_slaves =
+ (slaves_entry_t *)
malloc (new_slaves_allocated * sizeof (slaves_entry_t));
if (new_slaves == NULL)
{
return 127. */
int
wait_subprocess (pid_t child, const char *progname,
- bool null_stderr,
+ bool ignore_sigpipe, bool null_stderr,
bool slave_process, bool exit_on_error)
{
-#if HAVE_WAITID && defined WNOWAIT
+#if HAVE_WAITID && defined WNOWAIT && 0
+ /* Commented out because waitid() with WNOWAIT doesn't work: On Solaris 7
+ and OSF/1 4.0, it returns -1 and sets errno = ECHILD, and on HP-UX 10.20
+ it just hangs. */
/* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
true, and this process sleeps a very long time between the return from
waitpid() and the execution of unregister_slave_subprocess(), and
{
case CLD_KILLED:
case CLD_DUMPED:
+# ifdef SIGPIPE
+ if (info.si_status == SIGPIPE && ignore_sigpipe)
+ return 0;
+# endif
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, 0,
_("%s subprocess got fatal signal %d"),
if (WIFSIGNALED (status))
{
+# ifdef SIGPIPE
+ if (WTERMSIG (status) == SIGPIPE && ignore_sigpipe)
+ return 0;
+# endif
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, 0,
_("%s subprocess got fatal signal %d"),