Module Name: src
Committed By: rillig
Date: Sun Jul 26 23:03:54 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): make test for dynamic variable name more specific
Since all the string literals have either 7 or 8 characters, there is no
need to call strcmp for shorter or longer variable names.
To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 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.335 src/usr.bin/make/var.c:1.336
--- src/usr.bin/make/var.c:1.335 Sun Jul 26 22:43:16 2020
+++ src/usr.bin/make/var.c Sun Jul 26 23:03:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.335 2020/07/26 22:43:16 rillig Exp $ */
+/* $NetBSD: var.c,v 1.336 2020/07/26 23:03:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.335 2020/07/26 22:43:16 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.336 2020/07/26 23:03:54 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.335 2020/07/26 22:43:16 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.336 2020/07/26 23:03:54 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -3384,7 +3384,7 @@ VarIsDynamic(GNode *ctxt, const char *va
return FALSE;
}
- if (namelen > 2 && varname[0] == '.' &&
+ if ((namelen == 7 || namelen == 8) && varname[0] == '.' &&
isupper((unsigned char) varname[1]) &&
(ctxt == VAR_CMD || ctxt == VAR_GLOBAL))
{
