Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): replace snprintf/malloc in ReadMakefil...
details: https://anonhg.NetBSD.org/src/rev/38a387c882e4
branches: trunk
changeset: 974803:38a387c882e4
user: rillig <rillig%NetBSD.org@localhost>
date: Tue Aug 11 18:52:03 2020 +0000
description:
make(1): replace snprintf/malloc in ReadMakefile with str_concat3
diffstat:
usr.bin/make/main.c | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diffs (63 lines):
diff -r 31bbfa09eb54 -r 38a387c882e4 usr.bin/make/main.c
--- a/usr.bin/make/main.c Tue Aug 11 18:44:52 2020 +0000
+++ b/usr.bin/make/main.c Tue Aug 11 18:52:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.303 2020/08/10 19:53:19 rillig Exp $ */
+/* $NetBSD: main.c,v 1.304 2020/08/11 18:52:03 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.303 2020/08/10 19:53:19 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.304 2020/08/11 18:52:03 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.303 2020/08/10 19:53:19 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.304 2020/08/11 18:52:03 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1517,8 +1517,7 @@
{
const char *fname = p; /* makefile to read */
int fd;
- size_t len = MAXPATHLEN;
- char *name, *path = bmake_malloc(len);
+ char *name, *path = NULL;
if (!strcmp(fname, "-")) {
Parse_File(NULL /*stdin*/, -1);
@@ -1526,22 +1525,16 @@
} else {
/* if we've chdir'd, rebuild the path name */
if (strcmp(curdir, objdir) && *fname != '/') {
- size_t plen = strlen(curdir) + strlen(fname) + 2;
- if (len < plen)
- path = bmake_realloc(path, len = 2 * plen);
-
- (void)snprintf(path, len, "%s/%s", curdir, fname);
+ path = str_concat3(curdir, "/", fname);
fd = open(path, O_RDONLY);
if (fd != -1) {
fname = path;
goto found;
}
+ free(path);
/* If curdir failed, try objdir (ala .depend) */
- plen = strlen(objdir) + strlen(fname) + 2;
- if (len < plen)
- path = bmake_realloc(path, len = 2 * plen);
- (void)snprintf(path, len, "%s/%s", objdir, fname);
+ path = str_concat3(objdir, "/", fname);
fd = open(path, O_RDONLY);
if (fd != -1) {
fname = path;
Home |
Main Index |
Thread Index |
Old Index