Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): add field names in declaration of DEFS...



details:   https://anonhg.NetBSD.org/src/rev/6f37ee569ef9
branches:  trunk
changeset: 956169:6f37ee569ef9
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Oct 23 16:00:23 2020 +0000

description:
make(1): add field names in declaration of DEFSHELL_CUSTOM

diffstat:

 usr.bin/make/job.c |  23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 41bb6a1ef1a3 -r 6f37ee569ef9 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Fri Oct 23 15:54:17 2020 +0000
+++ b/usr.bin/make/job.c        Fri Oct 23 16:00:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.273 2020/10/23 15:54:17 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.274 2020/10/23 16:00:23 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.273 2020/10/23 15:54:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.274 2020/10/23 16:00:23 rillig Exp $");
 
 # define STATIC static
 
@@ -277,11 +277,20 @@
      * sh-compatible shells.
      */
 {
-    DEFSHELL_CUSTOM,
-    FALSE, "", "", "", 0,
-    FALSE, "echo \"%s\"\n", "%s\n", "{ %s \n} || exit $?\n", "'\n'", '#',
-    "",
-    "",
+    DEFSHELL_CUSTOM,           /* .name */
+    FALSE,                     /* .hasEchoCtl */
+    "",                                /* .echoOff */
+    "",                                /* .echoOn */
+    "",                                /* .noPrint */
+    0,                         /* .noPrintLen */
+    FALSE,                     /* .hasErrCtl */
+    "echo \"%s\"\n",           /* .errCheck */
+    "%s\n",                    /* .ignErr */
+    "{ %s \n} || exit $?\n",   /* .errOut */
+    "'\n'",                    /* .newline */
+    '#',                       /* .commentChar */
+    "",                                /* .echo */
+    "",                                /* .exit */
 },
 #endif /* DEFSHELL_CUSTOM */
     /*



Home | Main Index | Thread Index | Old Index