Module Name: src
Committed By: rillig
Date: Sat Aug 8 12:32:26 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: vardebug.exp
Log Message:
make(1): fix debug output for indirect modifiers
The trailing part after the modifier was confusing at best. It does
make sense to log the string from p to p+rlen, but not from p+len to
p+len+len.
Consistently use double quotes for strings.
To generate a diff of this commit:
cvs rdiff -u -r1.417 -r1.418 src/usr.bin/make/var.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/vardebug.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.417 src/usr.bin/make/var.c:1.418
--- src/usr.bin/make/var.c:1.417 Fri Aug 7 20:35:03 2020
+++ src/usr.bin/make/var.c Sat Aug 8 12:32:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.417 2020/08/07 20:35:03 rillig Exp $ */
+/* $NetBSD: var.c,v 1.418 2020/08/08 12:32:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.417 2020/08/07 20:35:03 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.418 2020/08/08 12:32:26 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.417 2020/08/07 20:35:03 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.418 2020/08/08 12:32:26 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -3066,8 +3066,7 @@ ApplyModifiers(
goto apply_mods;
}
- VAR_DEBUG("Got '%s' from '%.*s'%.*s\n",
- rval, rlen, p, rlen, p + rlen);
+ VAR_DEBUG("Indirect modifier \"%s\" from \"%.*s\"\n", rval, rlen, p);
p += rlen;
Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.2 src/usr.bin/make/unit-tests/vardebug.exp:1.3
--- src/usr.bin/make/unit-tests/vardebug.exp:1.2 Sat Aug 8 12:22:10 2020
+++ src/usr.bin/make/unit-tests/vardebug.exp Sat Aug 8 12:32:26 2020
@@ -43,7 +43,7 @@ Applying[] :U to ""
Result[] of :U is "value"
Applying[] :U to ""
Result[] of :U is "M*e"
-Got 'M*e' from '${:UM*e}':Mvalu[e
+Indirect modifier "M*e" from "${:UM*e}"
Applying[] :M to "value"
Pattern[] for [value] is [*e]
ModifyWords: split "value" into 1 words
