[src/trunk]: src/usr.bin/make PR/9898: David Holland: small glitch in var sub...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc0681cad829
branches:  trunk
changeset: 485025:fc0681cad829
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 16 23:35:16 2000 +0000

description:
PR/9898: David Holland: small glitch in var substitution for single letter
variables.

diffstat:

 usr.bin/make/var.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 211964b08982 -r fc0681cad829 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Apr 16 23:24:23 2000 +0000
+++ b/usr.bin/make/var.c        Sun Apr 16 23:35:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.37 1999/09/15 22:51:05 sommerfeld Exp $      */
+/*     $NetBSD: var.c,v 1.38 2000/04/16 23:35:16 christos Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: var.c,v 1.37 1999/09/15 22:51:05 sommerfeld Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.38 2000/04/16 23:35:16 christos 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.37 1999/09/15 22:51:05 sommerfeld Exp $");
+__RCSID("$NetBSD: var.c,v 1.38 2000/04/16 23:35:16 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2234,7 +2234,7 @@
                int expand;
                for (;;) {
                    if (str[1] != '(' && str[1] != '{') {
-                       if (str[1] != *var) {
+                       if (str[1] != *var && strlen(var) > 1) {
                            Buf_AddBytes(buf, 2, (Byte *) str);
                            str += 2;
                            expand = FALSE;