 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.531 2020/09/22 18:07:58 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.532 2020/09/22 19:08:47 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -111,27 +111,27 @@
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <time.h>
 #include    "make.h"
 #include    "dir.h"
 #include    "job.h"
 #include    "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.531 2020/09/22 18:07:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.532 2020/09/22 19:08:47 rillig Exp $");
 #define VAR_DEBUG_IF(cond, fmt, ...)	\
     if (!(DEBUG(VAR) && (cond)))	\
 	(void) 0;			\
     else				\
 	fprintf(debug_file, fmt, __VA_ARGS__)
 #define VAR_DEBUG(fmt, ...) VAR_DEBUG_IF(TRUE, fmt, __VA_ARGS__)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
 @@ -3699,40 +3699,35 @@ Var_Parse(const char **pp, GNode *ctxt,
  *	str		the string which to substitute
  *	ctxt		the context wherein to find variables
  *	eflags		VARE_UNDEFERR	if undefineds are an error
  *			VARE_WANTRES	if we actually want the result
  *			VARE_ASSIGN	if we are in a := assignment
+ *
  * Results:
  *	The resulting string.
  */
 char *
 Var_Subst(const char *str, GNode *ctxt, VarEvalFlags eflags)
+{
     Buffer buf;			/* Buffer for forming things */
     Boolean trailingBackslash;
     /* Set true if an error has already been reported,
      * to prevent a plethora of messages when recursing */
     static Boolean errorReported;
     Buf_Init(&buf, 0);
     errorReported = FALSE;
     trailingBackslash = FALSE;	/* variable ends in \ */
     while (*str) {
 	if (*str == '\n' && trailingBackslash)
 	    Buf_AddByte(&buf, ' ');
 	if (*str == '$' && str[1] == '$') {
 	    /*
 	     * A dollar sign may be escaped with another dollar sign.
 	     * In such a case, we skip over the escape character and store the
 	     * dollar sign into the buffer directly.
 	     */
 	    if (save_dollars && (eflags & VARE_ASSIGN))
 		Buf_AddByte(&buf, '$');
 	    Buf_AddByte(&buf, '$');
 	    str += 2;
 	} else if (*str != '$') {
 	    /*
 	     * Skip as many characters as possible -- either to the end of
 @@ -3772,27 +3767,26 @@ Var_Subst(const char *str, GNode *ctxt,
 		    str = nested_str;
 		    errorReported = TRUE;
 		} else {
 		    Buf_AddByte(&buf, *str);
 		    str++;
+		}
 	    } else {
 		size_t val_len;
 		str = nested_str;
 		val_len = strlen(val);
 		Buf_AddBytes(&buf, val, val_len);
 		trailingBackslash = val_len > 0 && val[val_len - 1] == '\\';
+	    }
 	    free(freeIt);
 	    freeIt = NULL;
+	}
+    }
     return Buf_DestroyCompact(&buf);
+}
 /* Initialize the module. */
 void
 Var_Init(void)
+{

 @@ -1,14 +1,14 @@
-# $NetBSD: directive-for.mk,v 1.4 2020/09/22 18:54:51 rillig Exp $
+# $NetBSD: directive-for.mk,v 1.5 2020/09/22 19:08:48 rillig Exp $
+#
 # Tests for the .for directive.
 # Using the .for loop, lists of values can be produced.
 # In simple cases, the :@var@${var}@ variable modifier can be used to
 # reach the same effects.
+#
 .undef NUMBERS
 .for num in 1 2 3
 NUMBERS+=	${num}
 .endfor
 .if ${NUMBERS} != "1 2 3"
 .  error
 @@ -111,19 +111,19 @@ EXPANSION${plus}=	value
 # Until 2012-06-03, the .for loop had split the words at whitespace, without
 # taking quotes into account.  This made it possible to have variable values
 # like "a:\ a:\file.txt" that ended in a single backslash.  Since then, the
 # variable values have been replaced with expressions of the form ${:U...},
 # which are not interpreted as code anymore.
+#
 # As of 2020-09-22, a comment in for.c says that it may be possible to
 # produce an "unwanted substitution", but there is no demonstration code yet.
+#
 # The above changes prevent a backslash at the end of a word from being
 # interpreted as part of the code.  Because of this, the trailingBackslash
 # hack in Var_Subst is no longer needed and as of 2020-09-22, has been
 # removed.
-.for path in a:\ a:\file.txt
+.for path in a:\ a:\file.txt d:\\ d:\\file.txt
 .  info ${path}
 .endfor
 all:
 	@:;

 @@ -1,3 +1,5 @@
 make: "directive-for.mk" line 100: outer
 make: "directive-for.mk" line 125: a:\ a:\file.txt
 make: "directive-for.mk" line 125: d:\\
 make: "directive-for.mk" line 125: d:\\file.txt
 exit status 0