 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat.c,v 1.79 2010/06/03 15:40:15 sjg Exp $	*/
+/*	$NetBSD: compat.c,v 1.80 2010/08/07 06:44:08 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.79 2010/06/03 15:40:15 sjg Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.80 2010/08/07 06:44:08 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.79 2010/06/03 15:40:15 sjg Exp $");
+__RCSID("$NetBSD: compat.c,v 1.80 2010/08/07 06:44:08 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * compat.c --
  *	The routines in this file implement the full-compatibility
  *	mode of PMake. Most of the special functionality of PMake
  *	is available in this mode. Things not supported:
  *	    - different shells.
  *	    - friendly variable substitution.
+ *
  * Interface:
 @@ -371,26 +371,28 @@ again:
+    }
     if (mav)
 	free(mav);
     if (bp)
 	free(bp);
     Lst_Replace(cmdNode, NULL);
     /*
      * The child is off and running. Now all we can do is wait...
      */
     while (1) {
 	while ((retstat = wait(&reason)) != cpid) {
 	    if (retstat > 0)
 		JobReapChild(retstat, reason, FALSE); /* not ours? */
 	    if (retstat == -1 && errno != EINTR) {
 		break;
+	    }
+	}
 	if (retstat > -1) {
 	    if (WIFSTOPPED(reason)) {
 		status = WSTOPSIG(reason);		/* stopped */
 	    } else if (WIFEXITED(reason)) {
 		status = WEXITSTATUS(reason);		/* exited */
 		if (status != 0) {
 		    if (DEBUG(ERROR)) {
 		        fprintf(debug_file, "\n*** Failed target:  %s\n*** Failed command: ",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.152 2010/07/20 16:39:27 christos Exp $	*/
+/*	$NetBSD: job.c,v 1.153 2010/08/07 06:44:08 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.152 2010/07/20 16:39:27 christos Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.153 2010/08/07 06:44:08 sjg 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.152 2010/07/20 16:39:27 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.153 2010/08/07 06:44:08 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -334,27 +334,27 @@ static Job childExitJob;	/* child exit p
 #define TARG_FMT  "%s %s ---\n" /* Default format */
 #define MESSAGE(fp, gn) \
 	(void)fprintf(fp, targFmt, targPrefix, gn->name)
 static sigset_t caught_signals;	/* Set of signals we handle */
 #if defined(SYSV)
 #define KILLPG(pid, sig)	kill(-(pid), (sig))
 #else
 #define KILLPG(pid, sig)	killpg((pid), (sig))
 #endif
 static void JobChildSig(int);
 static void JobContinueSig(int);
-static Job *JobFindPid(int, int);
+static Job *JobFindPid(int, int, Boolean);
 static int JobPrintCommand(void *, void *);
 static int JobSaveCommand(void *, void *);
 static void JobClose(Job *);
 static void JobExec(Job *, char **);
 static void JobMakeArgv(Job *, char **);
 static int JobStart(GNode *, int);
 static char *JobOutput(Job *, char *, char *, int);
 static void JobDoOutput(Job *, Boolean);
 static Shell *JobMatchShell(const char *);
 static void JobInterrupt(int, int);
 static void JobRestartJobs(void);
 static void JobTokenAdd(void);
 static void JobSigLock(sigset_t *);
 @@ -606,35 +606,35 @@ JobPassSig_suspend(int signo)
+ *
  * Input:
  *	job		job to examine
  *	pid		process id desired
+ *
  * Results:
  *	Job with matching pid
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static Job *
-JobFindPid(int pid, int status)
+JobFindPid(int pid, int status, Boolean isJobs)
+{
     Job *job;
     for (job = job_table; job < job_table_end; job++) {
 	if ((job->job_state == status) && job->pid == pid)
 	    return job;
+    }
-    if (DEBUG(JOB))
+    if (DEBUG(JOB) && isJobs)
 	job_table_dump("no pid");
     return NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobPrintCommand  --
  *	Put out another command for the given job. If the command starts
  *	with an @ or a - we process it specially. In the former case,
  *	so long as the -s and -n flags weren't given to make, we stick
  *	a shell-specific echoOff command in the script. In the latter,
  *	we ignore errors for the entire job, unless the shell has error
  *	control.
 @@ -1917,75 +1917,93 @@ JobRun(GNode *targ)
+ *
  * Notes:
  *	We do waits, blocking or not, according to the wisdom of our
  *	caller, until there are no more children to report. For each
  *	job, call JobFinish to finish things off.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Job_CatchChildren(void)
+{
     int    	  pid;	    	/* pid of dead child */
     Job		  *job;	    	/* job descriptor for dead child */
     int	  	  status;   	/* Exit/termination status */
     /*
      * Don't even bother if we know there's no one around.
      */
     if (jobTokensRunning == 0)
 	return;
     while ((pid = waitpid((pid_t) -1, &status, WNOHANG | WUNTRACED)) > 0) {
 	if (DEBUG(JOB)) {
 	    (void)fprintf(debug_file, "Process %d exited/stopped status %x.\n", pid,
 	      status);
+	}
 	JobReapChild(pid, status, TRUE);
+    }
+}
 /*
  * It is possible that wait[pid]() was called from elsewhere,
  * this lets us reap jobs regardless.
  */
 void
 JobReapChild(pid_t pid, int status, Boolean isJobs)
+{
     Job		  *job;	    	/* job descriptor for dead child */
     /*
      * Don't even bother if we know there's no one around.
      */
     if (jobTokensRunning == 0)
 	return;
-	job = JobFindPid(pid, JOB_ST_RUNNING);
+    job = JobFindPid(pid, JOB_ST_RUNNING, isJobs);
-	if (job == NULL) {
+    if (job == NULL) {
 	if (isJobs) {
 	    if (!lurking_children)
 		Error("Child (%d) status %x not in table?", pid, status);
 	    continue;
+	}
-	if (WIFSTOPPED(status)) {
+	return;				/* not ours */
 	    if (DEBUG(JOB)) {
-		(void)fprintf(debug_file, "Process %d (%s) stopped.\n",
+    if (WIFSTOPPED(status)) {
-				job->pid, job->node->name);
+	if (DEBUG(JOB)) {
 	    (void)fprintf(debug_file, "Process %d (%s) stopped.\n",
-	    if (!make_suspended) {
+			  job->pid, job->node->name);
 		    switch (WSTOPSIG(status)) {
-		    case SIGTSTP:
+	if (!make_suspended) {
-			(void)printf("*** [%s] Suspended\n", job->node->name);
+	    switch (WSTOPSIG(status)) {
-			break;
+	    case SIGTSTP:
-		    case SIGSTOP:
+		(void)printf("*** [%s] Suspended\n", job->node->name);
-			(void)printf("*** [%s] Stopped\n", job->node->name);
+		break;
-			break;
+	    case SIGSTOP:
-		    default:
+		(void)printf("*** [%s] Stopped\n", job->node->name);
-			(void)printf("*** [%s] Stopped -- signal %d\n",
+		break;
-			    job->node->name, WSTOPSIG(status));
+	    default:
 		(void)printf("*** [%s] Stopped -- signal %d\n",
-		    job->job_suspended = 1;
+			     job->node->name, WSTOPSIG(status));
+	    }
-	    (void)fflush(stdout);
+	    job->job_suspended = 1;
 	    continue;
+	}
 	(void)fflush(stdout);
 	return;
+    }
-	job->job_state = JOB_ST_FINISHED;
+    job->job_state = JOB_ST_FINISHED;
-	job->exit_status = status;
+    job->exit_status = status;
-	JobFinish(job, status);
+    JobFinish(job, status);
+}
 /*-
  *-----------------------------------------------------------------------
  * Job_CatchOutput --
  *	Catch the output from our children, if we're using
  *	pipes do so. Otherwise just block time until we get a
  *	signal(most likely a SIGCHLD) since there's no point in
  *	just spinning when there's nothing to do and the reaping
  *	of a child can wait for a while.
+ *
  * Results:
  *	None

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.188 2010/06/03 15:40:16 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.189 2010/08/07 06:44:08 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,39 +59,39 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.188 2010/06/03 15:40:16 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.189 2010/08/07 06:44:08 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.188 2010/06/03 15:40:16 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.189 2010/08/07 06:44:08 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -1631,29 +1631,30 @@ Cmd_Exec(const char *cmd, const char **e
 	    if (cc > 0)
 		Buf_AddBytes(&buf, cc, result);
+	}
 	while (cc > 0 || (cc == -1 && errno == EINTR));
 	/*
 	 * Close the input side of the pipe.
 	 */
 	(void)close(fds[0]);
 	/*
 	 * Wait for the process to exit.
 	 */
-	while(((pid = waitpid(cpid, &status, 0)) != cpid) && (pid >= 0))
+	while(((pid = waitpid(cpid, &status, 0)) != cpid) && (pid >= 0)) {
 	    JobReapChild(pid, status, FALSE);
 	    continue;
+	}
 	cc = Buf_Size(&buf);
 	res = Buf_Destroy(&buf, FALSE);
 	if (cc == 0)
 	    *errnum = "Couldn't read shell's output for \"%s\"";
 	if (WIFSIGNALED(status))
 	    *errnum = "\"%s\" exited on a signal";
 	else if (WEXITSTATUS(status) != 0)
 	    *errnum = "\"%s\" returned non-zero status";
 	/*
 	 * Null-terminate the result, convert newlines to spaces and

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.59 2010/06/03 15:40:16 sjg Exp $	*/
+/*	$NetBSD: nonints.h,v 1.60 2010/08/07 06:44:08 sjg Exp $	*/
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -96,26 +96,29 @@ int Compat_Make(void *, void *);
 /* cond.c */
 struct If;
 int Cond_EvalExpression(const struct If *, char *, Boolean *, int);
 int Cond_Eval(char *);
 void Cond_restore_depth(unsigned int);
 unsigned int Cond_save_depth(void);
 /* for.c */
 int For_Eval(char *);
 int For_Accum(char *);
 void For_Run(int);
 /* job.c */
 void JobReapChild(pid_t, int, Boolean);
 /* main.c */
 void Main_ParseArgLine(const char *);
 void MakeMode(const char *);
 int main(int, char **);
 char *Cmd_Exec(const char *, const char **);
 void Error(const char *, ...) __attribute__((__format__(__printf__, 1, 2)));
 void Fatal(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2),__noreturn__));
 void Punt(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2),__noreturn__));
 void DieHorribly(void) __attribute__((__noreturn__));
 int PrintAddr(void *, void *);
 void Finish(int);