Module Name: src
Committed By: bouyer
Date: Wed Aug 4 11:04:59 UTC 2010
Modified Files:
src/usr.bin/make [netbsd-4]: job.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1401):
usr.bin/make/job.c: revision 1.152 via patch
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.124 -r1.124.2.1 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.124 src/usr.bin/make/job.c:1.124.2.1
--- src/usr.bin/make/job.c:1.124 Fri Oct 27 21:00:19 2006
+++ src/usr.bin/make/job.c Wed Aug 4 11:04:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.124 2006/10/27 21:00:19 dsl Exp $ */
+/* $NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer 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.124 2006/10/27 21:00:19 dsl Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer 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.124 2006/10/27 21:00:19 dsl Exp $");
+__RCSID("$NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer Exp $");
#endif
#endif /* not lint */
#endif
@@ -693,6 +693,7 @@
shutUp = TRUE;
break;
case '-':
+ job->flags |= JOB_IGNERR;
errOff = TRUE;
break;
case '+':
@@ -741,7 +742,7 @@
}
if (errOff) {
- if ( !(job->flags & JOB_IGNERR) && !noSpecials) {
+ if (!noSpecials) {
if (commandShell->hasErrCtl) {
/*
* we don't want the error-control commands showing
@@ -999,7 +1000,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 if (DEBUG(JOB)) {
@@ -1203,11 +1204,11 @@
static const char msg[] = ": don't know how to make";
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;
