[src/trunk]: src/usr.bin/make make(1): clean up JobWriteShellCommands

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0f751be9ff6
branches:  trunk
changeset: 980265:b0f751be9ff6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Jan 30 13:12:00 2021 +0000

description:
make(1): clean up JobWriteShellCommands

diffstat:

 usr.bin/make/job.c |  13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r a9b4abb2617c -r b0f751be9ff6 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sat Jan 30 13:02:54 2021 +0000
+++ b/usr.bin/make/job.c        Sat Jan 30 13:12:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.403 2021/01/30 13:02:54 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.404 2021/01/30 13:12:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.403 2021/01/30 13:02:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.404 2021/01/30 13:12:00 rillig Exp $");
 
 /*
  * A shell defines how the commands are run.  All commands for a target are
@@ -1593,11 +1593,6 @@
                Punt("Could not fdopen %s", tfile);
 
        (void)fcntl(fileno(job->cmdFILE), F_SETFD, FD_CLOEXEC);
-       /*
-        * Send the commands to the command file, flush all its
-        * buffers then rewind and remove the thing.
-        */
-       *out_run = TRUE;
 
 #ifdef USE_META
        if (useMeta) {
@@ -1607,9 +1602,7 @@
        }
 #endif
 
-       /* We can do all the commands at once. hooray for sanity */
-       if (!JobPrintCommands(job))
-               *out_run = FALSE;
+       *out_run = JobPrintCommands(job);
 
        free(tfile);
 }