[src/trunk]: src/usr.bin/make make(1): reorder branches in Var_Subst

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

details:   https://anonhg.NetBSD.org/src/rev/cc96cfb0e77b
branches:  trunk
changeset: 956863:cc96cfb0e77b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 18:16:55 2020 +0000

description:
make(1): reorder branches in Var_Subst

This way, '$$' is handled first, followed by '$', followed by everything
else.  This is easier to follow than first '$$' then not '$' and finally
'$'.

diffstat:

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

diffs (40 lines):

diff -r 3d392c4ce09b -r cc96cfb0e77b usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Nov 08 18:13:01 2020 +0000
+++ b/usr.bin/make/var.c        Sun Nov 08 18:16:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.678 2020/11/08 18:13:01 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.679 2020/11/08 18:16:55 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.678 2020/11/08 18:13:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.679 2020/11/08 18:16:55 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -4019,7 +4019,11 @@
                Buf_AddByte(&buf, '$');
            Buf_AddByte(&buf, '$');
            p += 2;
-       } else if (*p != '$') {
+
+       } else if (p[0] == '$') {
+           VarSubstNested(&p, &buf, ctxt, eflags, &errorReported);
+
+       } else {
            /*
             * Skip as many characters as possible -- either to the end of
             * the string or to the next dollar sign (variable expression).
@@ -4029,8 +4033,6 @@
            for (p++; *p != '$' && *p != '\0'; p++)
                continue;
            Buf_AddBytesBetween(&buf, plainStart, p);
-       } else {
-           VarSubstNested(&p, &buf, ctxt, eflags, &errorReported);
        }
     }