[src/trunk]: src/usr.bin/make Don't wait forever for output from a child job.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7be96f64818
branches:  trunk
changeset: 784576:d7be96f64818
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 02 15:11:48 2013 +0000

description:
Don't wait forever for output from a child job.

diffstat:

 usr.bin/make/job.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r e29ba8e1b213 -r d7be96f64818 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sat Feb 02 14:15:55 2013 +0000
+++ b/usr.bin/make/job.c        Sat Feb 02 15:11:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.165 2013/01/26 15:52:59 christos Exp $       */
+/*     $NetBSD: job.c,v 1.166 2013/02/02 15:11:48 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.165 2013/01/26 15:52:59 christos Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.166 2013/02/02 15:11:48 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.165 2013/01/26 15:52:59 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.166 2013/02/02 15:11:48 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2050,7 +2050,8 @@
     if (nready < 0 || readyfd(&childExitJob)) {
        char token = 0;
        nready -= 1;
-       while (read(childExitJob.inPipe, &token, 1) == -1 && errno == EAGAIN)
+       for (size_t i = 0; i < 5 &&
+           read(childExitJob.inPipe, &token, 1) == -1 && errno == EAGAIN; i++)
                continue;
        if (token == DO_JOB_RESUME[0])
            /* Complete relay requested from our SIGCONT handler */