X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fpidwait.c;h=ba9bae21bf996a84eb74b49642a72e04f9c48c15;hp=d7dd1d79ac79362d65667b6f4e3dbb61e62b2b61;hb=641a9d953e86685f9ca2f3da72e9a94e5bcfd69e;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index d7dd1d7..ba9bae2 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -1,55 +1,38 @@
 /*
- * pidwait.c -- wait for child to exit
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** pidwait.c -- wait for child to exit
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 int
-pidwait (pid_t id, int sigsok)
+pidwait(pid_t id, int sigsok)
 {
 	pid_t pid;
 	SIGNAL_HANDLER istat = NULL, qstat = NULL;
-
-#ifdef HAVE_UNION_WAIT
-	union wait status;
-#else
 	int status;
-#endif
 
 	if (sigsok == -1) {
 		/* ignore a couple of signals */
-		istat = SIGNAL (SIGINT, SIG_IGN);
-		qstat = SIGNAL (SIGQUIT, SIG_IGN);
+		istat = SIGNAL(SIGINT, SIG_IGN);
+		qstat = SIGNAL(SIGQUIT, SIG_IGN);
 	}
 
-#ifdef HAVE_WAITPID
 	while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
 		;
-#else
-	while ((pid = wait(&status)) != -1 && pid != id)
-		continue;
-#endif
 
 	if (sigsok == -1) {
 		/* reset the signal handlers */
-		SIGNAL (SIGINT, istat);
-		SIGNAL (SIGQUIT, qstat);
+		SIGNAL(SIGINT, istat);
+		SIGNAL(SIGQUIT, qstat);
 	}
 
-#ifdef HAVE_UNION_WAIT
-	return (pid == -1 ? -1 : status.w_status);
-#else
 	return (pid == -1 ? -1 : status);
-#endif
 }