[src/trunk]: src/usr.bin/make make(1): mark inconsistent word separators for ...

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

details:   https://anonhg.NetBSD.org/src/rev/e6f4d4b881fb
branches:  trunk
changeset: 936954:e6f4d4b881fb
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Aug 09 13:16:10 2020 +0000

description:
make(1): mark inconsistent word separators for variable modifiers

diffstat:

 usr.bin/make/var.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 231ceb236f75 -r e6f4d4b881fb usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Aug 09 13:05:04 2020 +0000
+++ b/usr.bin/make/var.c        Sun Aug 09 13:16:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.441 2020/08/09 13:05:04 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.442 2020/08/09 13:16:10 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.441 2020/08/09 13:05:04 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.442 2020/08/09 13:16:10 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.441 2020/08/09 13:05:04 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.442 2020/08/09 13:16:10 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1612,7 +1612,7 @@
 
     for (i = 0; i < ac; i++) {
        if (i != 0)
-           Buf_AddByte(&buf, ' ');
+           Buf_AddByte(&buf, ' ');     /* XXX: st->sep, for consistency */
        Buf_AddStr(&buf, av[i]);
     }
 
@@ -2215,7 +2215,7 @@
 
     for (i = 0; i < n; i++) {
        if (i != 0)
-           Buf_AddByte(&buf, ' ');
+           Buf_AddByte(&buf, ' ');     /* XXX: st->sep, for consistency */
        Buf_AddInt(&buf, 1 + i);
     }
 
@@ -3667,6 +3667,7 @@
     while (*str) {
        if (*str == '\n' && trailingBslash)
            Buf_AddByte(&buf, ' ');
+
        if (*str == '$' && str[1] == '$') {
            /*
             * A dollar sign may be escaped with another dollar sign.