Module Name: src
Committed By: dholland
Date: Sat Sep 13 23:21:01 UTC 2014
Modified Files:
src/usr.bin/make: var.c
Log Message:
Recognize the crazy POSIXisms $(?D) and $(?F); issue 2 in PR 49085
from Jarmo Jaakkola.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/usr.bin/make/var.c
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.189 src/usr.bin/make/var.c:1.190
--- src/usr.bin/make/var.c:1.189 Sat Sep 13 23:10:28 2014
+++ src/usr.bin/make/var.c Sat Sep 13 23:21:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.189 2014/09/13 23:10:28 dholland Exp $ */
+/* $NetBSD: var.c,v 1.190 2014/09/13 23:21:01 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.189 2014/09/13 23:10:28 dholland Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.190 2014/09/13 23:21:01 dholland 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.189 2014/09/13 23:10:28 dholland Exp $");
+__RCSID("$NetBSD: var.c,v 1.190 2014/09/13 23:21:01 dholland Exp $");
#endif
#endif /* not lint */
#endif
@@ -3734,7 +3734,7 @@ Var_Parse(const char *str, GNode *ctxt,
*/
if ((v == NULL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
(vlen == 2) && (str[1] == 'F' || str[1] == 'D') &&
- strchr("@%*!<>", str[0]) != NULL) {
+ strchr("@%?*!<>", str[0]) != NULL) {
/*
* Well, it's local -- go look for it.
*/
