summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2002-10-24 12:57:42 +0000
committerjmallett <jmallett@FreeBSD.org>2002-10-24 12:57:42 +0000
commit317532d0006c6f3697451f9b111c6c713841117d (patch)
tree434b9c30f71db7e9d74fe8bd8dd2af3c0ea23e74 /usr.bin
parente53ce9a22fccf76734b36192d2cc10f6b560d139 (diff)
downloadFreeBSD-src-317532d0006c6f3697451f9b111c6c713841117d.zip
FreeBSD-src-317532d0006c6f3697451f9b111c6c713841117d.tar.gz
When expanding a specific [1-char] variable, only expand said specific
[1-char] variable. Don't just automatically expand something which starts with that character. Obtained from: OpenBSD [3 years ago!]
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/var.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index aab2bf1..c0aaaaf 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -2281,7 +2281,7 @@ Var_Subst (char *var, char *str, GNode *ctxt, Boolean undefErr)
int expand;
for (;;) {
if (str[1] != '(' && str[1] != '{') {
- if (str[1] != *var) {
+ if (str[1] != *var || val[1] != '\0') {
Buf_AddBytes(buf, 2, (Byte *) str);
str += 2;
expand = FALSE;
OpenPOWER on IntegriCloud