 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.164 2013/01/25 02:01:10 sjg Exp $	*/
+/*	$NetBSD: job.c,v 1.165 2013/01/26 15:52:59 christos Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.164 2013/01/25 02:01:10 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.165 2013/01/26 15:52:59 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.164 2013/01/25 02:01:10 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.165 2013/01/26 15:52:59 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -467,54 +467,57 @@ JobCondPassSig(int signo)
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	Sends a token on the child exit pipe to wake us up from
  *	select()/poll().
+ *
  *-----------------------------------------------------------------------
  */
 static void
 JobChildSig(int signo MAKE_ATTR_UNUSED)
+{
-    write(childExitJob.outPipe, CHILD_EXIT, 1);
+    while (write(childExitJob.outPipe, CHILD_EXIT, 1) == -1 && errno == EAGAIN)
 	continue;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobContinueSig --
  *	Resume all stopped jobs.
+ *
  * Input:
  *	signo		The signal number we've received
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	Jobs start running again.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 JobContinueSig(int signo MAKE_ATTR_UNUSED)
+{
     /*
      * Defer sending to SIGCONT to our stopped children until we return
      * from the signal handler.
      */
-    write(childExitJob.outPipe, DO_JOB_RESUME, 1);
+    while (write(childExitJob.outPipe, DO_JOB_RESUME, 1) == -1 &&
 	errno == EAGAIN)
 	continue;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobPassSig --
  *	Pass a signal on to all jobs, then resend to ourselves.
+ *
  * Input:
  *	signo		The signal number we've received
+ *
  * Results:
  *	None.
+ *
 @@ -1151,27 +1154,28 @@ Job_Touch(GNode *gn, Boolean silent)
 	times.actime = times.modtime = now;
 	if (utime(file, &times) < 0){
 	    streamID = open(file, O_RDWR | O_CREAT, 0666);
 	    if (streamID >= 0) {
 		char	c;
 		/*
 		 * Read and write a byte to the file to change the
 		 * modification time, then close the file.
 		 */
 		if (read(streamID, &c, 1) == 1) {
 		    (void)lseek(streamID, (off_t)0, SEEK_SET);
-		    (void)write(streamID, &c, 1);
+		    while (write(streamID, &c, 1) == -1 && errno == EAGAIN)
 			continue;
+		}
 		(void)close(streamID);
 	    } else {
 		(void)fprintf(stdout, "*** couldn't touch %s: %s",
 			       file, strerror(errno));
 		(void)fflush(stdout);
+	    }
+	}
+    }
+}
 /*-
 @@ -2036,27 +2040,28 @@ Job_CatchOutput(void)
+{
     int nready;
     Job *job;
     int i;
     (void)fflush(stdout);
     /* The first fd in the list is the job token pipe */
     nready = poll(fds + 1 - wantToken, nfds - 1 + wantToken, POLL_MSEC);
     if (nready < 0 || readyfd(&childExitJob)) {
 	char token = 0;
 	nready -= 1;
-	(void)read(childExitJob.inPipe, &token, 1);
+	while (read(childExitJob.inPipe, &token, 1) == -1 && errno == EAGAIN)
 		continue;
 	if (token == DO_JOB_RESUME[0])
 	    /* Complete relay requested from our SIGCONT handler */
 	    JobRestartJobs();
 	Job_CatchChildren();
+    }
     if (nready <= 0)
 	return;
     if (wantToken && readyfd(&tokenWaitJob))
 	nready--;
     for (i = 2; i < nfds; i++) {
 @@ -2767,27 +2772,28 @@ readyfd(Job *job)
 static void
 JobTokenAdd(void)
+{
     char tok = JOB_TOKENS[aborting], tok1;
     /* If we are depositing an error token flush everything else */
     while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1)
 	continue;
     if (DEBUG(JOB))
 	fprintf(debug_file, "(%d) aborting %d, deposit token %c\n",
 	    getpid(), aborting, JOB_TOKENS[aborting]);
-    write(tokenWaitJob.outPipe, &tok, 1);
+    while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN)
 	continue;
+}
 /*-
  *-----------------------------------------------------------------------
  * Job_ServerStartTokenAdd --
  *	Prep the job token pipe in the root make process.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Job_ServerStart(int max_tokens, int jp_0, int jp_1)
+{
 @@ -2880,33 +2886,35 @@ Job_TokenWithdraw(void)
 	if (DEBUG(JOB))
 	    fprintf(debug_file, "(%d) blocked for token\n", getpid());
 	wantToken = 1;
 	return FALSE;
+    }
     if (count == 1 && tok != '+') {
 	/* make being abvorted - remove any other job tokens */
 	if (DEBUG(JOB))
 	    fprintf(debug_file, "(%d) aborted by token %c\n", getpid(), tok);
 	while (read(tokenWaitJob.inPipe, &tok1, 1) == 1)
 	    continue;
 	/* And put the stopper back */
-	write(tokenWaitJob.outPipe, &tok, 1);
+	while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN)
 	    continue;
 	Fatal("A failure has been detected in another branch of the parallel make");
+    }
     if (count == 1 && jobTokensRunning == 0)
 	/* We didn't want the token really */
-	write(tokenWaitJob.outPipe, &tok, 1);
+	while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN)
 	    continue;
     jobTokensRunning++;
     if (DEBUG(JOB))
 	fprintf(debug_file, "(%d) withdrew token\n", getpid());
     return TRUE;
+}
 #ifdef USE_SELECT
 int
 emul_poll(struct pollfd *fd, int nfd, int timeout)
+{
     fd_set rfds, wfds;
     int i, maxfd, nselect, npoll;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.204 2013/01/25 02:01:10 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.205 2013/01/26 15:53:00 christos Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,39 +59,39 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.204 2013/01/25 02:01:10 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.205 2013/01/26 15:53:00 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.204 2013/01/25 02:01:10 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.205 2013/01/26 15:53:00 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -1698,27 +1698,28 @@ execError(const char *af, const char *av
 #define	IOADD(void)write(2, s, strlen(s))
 #endif
 	IOADD(progname);
 	IOADD(": ");
 	IOADD(af);
 	IOADD("(");
 	IOADD(av);
 	IOADD(") failed (");
 	IOADD(strerror(errno));
 	IOADD(")\n");
 #ifdef USE_IOVEC
-	(void)writev(2, iov, 8);
+	while (writev(2, iov, 8) == -1 && errno == EAGAIN)
 	    continue;
 #endif
+}
 /*
  * usage --
  *	exit with usage message
  */
 static void
 usage(void)
+{
 	(void)fprintf(stderr,
 "usage: %s [-BeikNnqrstWX] \n\
             [-C directory] [-D variable] [-d flags] [-f makefile]\n\