From 2920650756da6bdee6eea5b37676949ba21c240f Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Tue, 2 Mar 2004 22:05:58 +0000
Subject: [PATCH] Minor execute changes

---
 lib/execute.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/execute.c b/lib/execute.c
index 84345e0b..893303da 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -40,7 +40,7 @@ int _execute(char **, char *, char *, char *);
 int _execute(char **args, char *in, char *out, char *err)
 {
     char    buf[PATH_MAX];
-    int	    i, pid, status = 0, rc = 0;
+    int	    i, pid, terrno = 0, status = 0, rc = 0;
 
     memset(&buf, 0, sizeof(buf));
     for (i = 0; i < 16; i++) {
@@ -76,6 +76,7 @@ int _execute(char **args, char *in, char *out, char *err)
 		exit(MBERR_EXEC_FAILED);
 	    }
 	}
+
 	errno = 0;
 	rc = getpriority(PRIO_PROCESS, 0);
 	if (errno == 0) {
@@ -96,12 +97,22 @@ int _execute(char **args, char *in, char *out, char *err)
 	e_pid = 0;
     } while (((rc > 0) && (rc != pid)) || ((rc == -1) && (errno == EINTR)));
 
+    terrno = errno;
     setpriority(PRIO_PROCESS, 0, 0);
+    errno = terrno;
 
     switch (rc) {
 	case -1:
-		WriteError("$Wait returned %d, status %d,%d", rc,status>>8,status&0xff);
-		return 0;
+		/*
+		 * Seems to be a problem on fast systems, hope it is ok.
+		 */
+		if (errno == ECHILD) {
+		    Syslog('+', "Execute: no child process, this seems well");
+		    return 0;
+		} else {
+		    WriteError("$Wait returned %d, status %d,%d", rc,status>>8,status&0xff);
+		    return -1;
+		}
 	case 0:
 		return 0;
 	default: