Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): in JobStart, negate 'noExec' to 'run'

Browse Source
This commit is contained in:
rillig 2020-12-10 20:14:35 +00:00
parent 8d426fd34d
commit 6d74c4fd10
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.352 2020/12/10 20:10:03 rillig Exp $ */ /* $NetBSD: job.c,v 1.353 2020/12/10 20:14:35 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -143,7 +143,7 @@
#include "trace.h" #include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */ /* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: job.c,v 1.352 2020/12/10 20:10:03 rillig Exp $"); MAKE_RCSID("$NetBSD: job.c,v 1.353 2020/12/10 20:14:35 rillig Exp $");
/* /*
* A shell defines how the commands are run. All commands for a target are * A shell defines how the commands are run. All commands for a target are
@ -1517,7 +1517,7 @@ JobStart(GNode *gn, JobFlags flags)
Job *job; /* new job descriptor */ Job *job; /* new job descriptor */
char *argv[10]; /* Argument vector to shell */ char *argv[10]; /* Argument vector to shell */
Boolean cmdsOK; /* true if the nodes commands were all right */ Boolean cmdsOK; /* true if the nodes commands were all right */
Boolean noExec; /* Set true if we decide not to run the job */ Boolean run;
int tfd; /* File descriptor to the temp file */ int tfd; /* File descriptor to the temp file */
for (job = job_table; job < job_table_end; job++) { for (job = job_table; job < job_table_end; job++) {
@ -1586,7 +1586,7 @@ JobStart(GNode *gn, JobFlags flags)
* Send the commands to the command file, flush all its * Send the commands to the command file, flush all its
* buffers then rewind and remove the thing. * buffers then rewind and remove the thing.
*/ */
noExec = FALSE; run = TRUE;
#ifdef USE_META #ifdef USE_META
if (useMeta) { if (useMeta) {
@ -1601,11 +1601,10 @@ JobStart(GNode *gn, JobFlags flags)
/* /*
* If we didn't print out any commands to the shell script, * If we didn't print out any commands to the shell script,
* there's not much point in executing the shell, is there? * there's no point in executing the shell.
*/ */
if (numCommands == 0) { if (numCommands == 0)
noExec = TRUE; run = FALSE;
}
free(tfile); free(tfile);
} else if (!GNode_ShouldExecute(gn)) { } else if (!GNode_ShouldExecute(gn)) {
@ -1625,7 +1624,7 @@ JobStart(GNode *gn, JobFlags flags)
if (cmdsOK) if (cmdsOK)
JobPrintCommands(job); JobPrintCommands(job);
/* Don't execute the shell, thank you. */ /* Don't execute the shell, thank you. */
noExec = TRUE; run = FALSE;
} else { } else {
/* /*
* Just touch the target and note that no shell should be * Just touch the target and note that no shell should be
@ -1635,13 +1634,13 @@ JobStart(GNode *gn, JobFlags flags)
*/ */
job->cmdFILE = stdout; job->cmdFILE = stdout;
Job_Touch(gn, (job->flags & JOB_SILENT) != 0); Job_Touch(gn, (job->flags & JOB_SILENT) != 0);
noExec = TRUE; run = FALSE;
} }
/* Just in case it isn't already... */ /* Just in case it isn't already... */
(void)fflush(job->cmdFILE); (void)fflush(job->cmdFILE);
/* If we're not supposed to execute a shell, don't. */ /* If we're not supposed to execute a shell, don't. */
if (noExec) { if (!run) {
if (!(job->flags & JOB_SPECIAL)) if (!(job->flags & JOB_SPECIAL))
Job_TokenReturn(); Job_TokenReturn();
/* Unlink and close the command file if we opened one */ /* Unlink and close the command file if we opened one */