[src/trunk]: src/usr.bin/make Accept whitespace between command specifiers @+...

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

details:   https://anonhg.NetBSD.org/src/rev/0627c1909254
branches:  trunk
changeset: 373091:0627c1909254
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 17 21:35:19 2023 +0000

description:
Accept whitespace between command specifiers @+- like gmake does. New binutils
does this.

diffstat:

 usr.bin/make/compat.c |  7 ++++---
 usr.bin/make/job.c    |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 736657b4de3f -r 0627c1909254 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Tue Jan 17 19:42:47 2023 +0000
+++ b/usr.bin/make/compat.c     Tue Jan 17 21:35:19 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.243 2022/12/07 10:28:48 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.244 2023/01/17 21:35:19 christos Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
 #include "pathnames.h"
 
 /*     "@(#)compat.c   8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.243 2022/12/07 10:28:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.244 2023/01/17 21:35:19 christos Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -280,7 +280,8 @@
                        doIt = true;
                        if (shellName == NULL)  /* we came here from jobs */
                                Shell_Init();
-               } else
+               } else if (!ch_isspace(*cmd))
+                       /* Ignore whitespace for compatibility with gnu make */
                        break;
                cmd++;
        }
diff -r 736657b4de3f -r 0627c1909254 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Tue Jan 17 19:42:47 2023 +0000
+++ b/usr.bin/make/job.c        Tue Jan 17 21:35:19 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.456 2022/10/10 21:17:25 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.457 2023/01/17 21:35:19 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.456 2022/10/10 21:17:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.457 2023/01/17 21:35:19 christos Exp $");
 
 /*
  * A shell defines how the commands are run.  All commands for a target are
@@ -732,7 +732,8 @@
                        out_cmdFlags->ignerr = true;
                else if (*p == '+')
                        out_cmdFlags->always = true;
-               else
+               else if (!ch_isspace(*p))
+                       /* Ignore whitespace for compatibility with gnu make */
                        break;
                p++;
        }