[src/trunk]: src/usr.bin/make make(1): refactor error handling in Compat_Run

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

details:   https://anonhg.NetBSD.org/src/rev/74e1ff378d66
branches:  trunk
changeset: 957685:74e1ff378d66
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 06 22:49:40 2020 +0000

description:
make(1): refactor error handling in Compat_Run

This is in preparation for the upcoming bug fixes.

diffstat:

 usr.bin/make/compat.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r ac4d1d7efb70 -r 74e1ff378d66 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Sun Dec 06 22:36:58 2020 +0000
+++ b/usr.bin/make/compat.c     Sun Dec 06 22:49:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.196 2020/11/28 19:22:32 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.197 2020/12/06 22:49:40 rillig Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
 #include "pathnames.h"
 
 /*     "@(#)compat.c   8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.196 2020/11/28 19:22:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.197 2020/12/06 22:49:40 rillig Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -665,6 +665,7 @@
 {
        GNode *gn = NULL;       /* Current root target */
        int indirectErrors;     /* Number of targets not remade due to errors */
+       Boolean seenError;
 
        if (!shellName)
                Shell_Init();
@@ -721,10 +722,12 @@
        /*
         * If the user has defined a .END target, run its commands.
         */
-       if (indirectErrors == 0) {
+       seenError = indirectErrors > 0;
+       if (!seenError) {
                GNode *endNode = Targ_GetEndNode();
                Compat_Make(endNode, endNode);
-               if (GNode_IsError(gn) || GNode_IsError(endNode)) {
+               seenError = GNode_IsError(gn) || GNode_IsError(endNode);
+               if (seenError) {
                        PrintOnError(gn, "\nStop.");
                        exit(1);
                }