Module Name: src Committed By: christos Date: Tue Jul 20 16:39:28 UTC 2010
Modified Files: src/usr.bin/make: job.c Log Message: 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) To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/usr.bin/make/job.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/job.c diff -u src/usr.bin/make/job.c:1.151 src/usr.bin/make/job.c:1.152 --- src/usr.bin/make/job.c:1.151 Wed Jun 16 23:36:05 2010 +++ src/usr.bin/make/job.c Tue Jul 20 12:39:27 2010 @@ -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;