Module Name: src
Committed By: rillig
Date: Tue Feb 23 00:27:48 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: moderrs.exp
Log Message:
make: quote ':S' in error message about missing delimiter
To generate a diff of this commit:
cvs rdiff -u -r1.845 -r1.846 src/usr.bin/make/var.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/moderrs.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.845 src/usr.bin/make/var.c:1.846
--- src/usr.bin/make/var.c:1.845 Tue Feb 23 00:25:06 2021
+++ src/usr.bin/make/var.c Tue Feb 23 00:27:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.845 2021/02/23 00:25:06 rillig Exp $ */
+/* $NetBSD: var.c,v 1.846 2021/02/23 00:27:47 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.845 2021/02/23 00:25:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.846 2021/02/23 00:27:47 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -2801,7 +2801,7 @@ ApplyModifier_Subst(const char **pp, App
char delim = (*pp)[1];
if (delim == '\0') {
- Error("Missing delimiter for :S modifier");
+ Error("Missing delimiter for modifier ':S'");
(*pp)++;
return AMR_CLEANUP;
}
Index: src/usr.bin/make/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.24 src/usr.bin/make/unit-tests/moderrs.exp:1.25
--- src/usr.bin/make/unit-tests/moderrs.exp:1.24 Tue Feb 23 00:04:48 2021
+++ src/usr.bin/make/unit-tests/moderrs.exp Tue Feb 23 00:27:48 2021
@@ -57,7 +57,7 @@ make: Unfinished modifier for "!" ('!' m
mod-subst-delimiter:
-make: Missing delimiter for :S modifier
+make: Missing delimiter for modifier ':S'
1:
make: Unfinished modifier for "VAR" (',' missing)
2:
