CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Sep 13 21:03:15 UTC 2020

Modified Files:
        src/usr.bin/make: var.c

Log Message:
make(1): in Var_Parse, replace bmake_strldup with bmake_strsedup


To generate a diff of this commit:
cvs rdiff -u -r1.518 -r1.519 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.518 src/usr.bin/make/var.c:1.519
--- src/usr.bin/make/var.c:1.518	Sun Sep 13 20:21:24 2020
+++ src/usr.bin/make/var.c	Sun Sep 13 21:03:14 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.518 2020/09/13 20:21:24 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.519 2020/09/13 21:03:14 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
 #include    "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.518 2020/09/13 20:21:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.519 2020/09/13 21:03:14 rillig Exp $");
 
 #define VAR_DEBUG_IF(cond, fmt, ...)	\
     if (!(DEBUG(VAR) && (cond)))	\
@@ -3646,8 +3646,10 @@ Var_Parse(const char **pp, GNode *ctxt, 
 	}
     }
 
-    /* Skip past endc if possible. */
-    *pp = p + (*p ? 1 : 0);
+    if (*p != '\0')		/* Skip past endc if possible. */
+	p++;
+
+    *pp = p;
 
     if (v->flags & VAR_FROM_ENV) {
         /* Free the environment variable now since we own it,
@@ -3669,7 +3671,7 @@ Var_Parse(const char **pp, GNode *ctxt, 
 		*freePtr = NULL;
 	    }
 	    if (dynamic) {
-		nstr = bmake_strldup(start, (size_t)(*pp - start));
+		nstr = bmake_strsedup(start, p);
 		*freePtr = nstr;
 	    } else {
 		nstr = (eflags & VARE_UNDEFERR) ? var_Error : varNoError;