CVS commit: [netbsd-5] src/usr.bin/make

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Sun Nov 21 18:45:00 UTC 2010

Modified Files:
        src/usr.bin/make [netbsd-5]: job.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1433):
        usr.bin/make/job.c: revision 1.152
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.141 -r1.141.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.141 src/usr.bin/make/job.c:1.141.2.1
--- src/usr.bin/make/job.c:1.141	Wed Oct 29 15:37:08 2008
+++ src/usr.bin/make/job.c	Sun Nov 21 18:45:00 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.141 2008/10/29 15:37:08 sjg Exp $	*/
+/*	$NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz 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.141 2008/10/29 15:37:08 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz 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.141 2008/10/29 15:37:08 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz 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 if (DEBUG(JOB)) {
@@ -1229,11 +1230,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;