[src/trunk]: src/usr.bin/make PR/43643: David A. Holland: dash prefix broken ...

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

details:   https://anonhg.NetBSD.org/src/rev/12620c7f534b
branches:  trunk
changeset: 756514:12620c7f534b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 20 16:39:27 2010 +0000

description:
PR/43643: David A. Holland: dash prefix broken with make -j
As the comment says in JobPrintJob set JOB_IGNERR with - commands. Fix
whitespace so that the output is consistent, although there are two separate
execution logic implementations (command.c, job.c)

diffstat:

 usr.bin/make/job.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r b4b90d0ad5f2 -r 12620c7f534b usr.bin/make/job.c
--- a/usr.bin/make/job.c        Tue Jul 20 15:09:32 2010 +0000
+++ b/usr.bin/make/job.c        Tue Jul 20 16:39:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.151 2010/06/17 03:36:05 sjg Exp $    */
+/*     $NetBSD: job.c,v 1.152 2010/07/20 16:39:27 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.151 2010/06/17 03:36:05 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.152 2010/07/20 16:39:27 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.151 2010/06/17 03:36:05 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.152 2010/07/20 16:39:27 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -713,6 +713,7 @@
            shutUp = DEBUG(LOUD) ? FALSE : TRUE;
            break;
        case '-':
+           job->flags |= JOB_IGNERR;
            errOff = TRUE;
            break;
        case '+':
@@ -761,7 +762,7 @@
     }
 
     if (errOff) {
-       if ( !(job->flags & JOB_IGNERR) && !noSpecials) {
+       if (!noSpecials) {
            if (commandShell->hasErrCtl) {
                /*
                 * we don't want the error-control commands showing
@@ -1019,7 +1020,7 @@
                (void)printf("*** [%s] Error code %d%s\n",
                                job->node->name,
                               WEXITSTATUS(status),
-                              (job->flags & JOB_IGNERR) ? "(ignored)" : "");
+                              (job->flags & JOB_IGNERR) ? " (ignored)" : "");
                if (job->flags & JOB_IGNERR) {
                    status = 0;
                } else {
@@ -1232,11 +1233,11 @@
            }
 
            if (gn->type & OP_OPTIONAL) {
-               (void)fprintf(stdout, "%s%s %s(ignored)\n", progname,
+               (void)fprintf(stdout, "%s%s %s (ignored)\n", progname,
                    msg, gn->name);
                (void)fflush(stdout);
            } else if (keepgoing) {
-               (void)fprintf(stdout, "%s%s %s(continuing)\n", progname,
+               (void)fprintf(stdout, "%s%s %s (continuing)\n", progname,
                    msg, gn->name);
                (void)fflush(stdout);
                return FALSE;