Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make Avoid breaking !NetBSD build
details: https://anonhg.NetBSD.org/src/rev/c0d924572cd6
branches: trunk
changeset: 345676:c0d924572cd6
user: sjg <sjg%NetBSD.org@localhost>
date: Sun Jun 05 00:48:58 2016 +0000
description:
Avoid breaking !NetBSD build
diffstat:
usr.bin/make/main.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (39 lines):
diff -r 0646953c0d35 -r c0d924572cd6 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sun Jun 05 00:43:39 2016 +0000
+++ b/usr.bin/make/main.c Sun Jun 05 00:48:58 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.245 2016/06/03 01:21:59 sjg Exp $ */
+/* $NetBSD: main.c,v 1.246 2016/06/05 00:48:58 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.245 2016/06/03 01:21:59 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.246 2016/06/05 00:48:58 sjg 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.245 2016/06/03 01:21:59 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.246 2016/06/05 00:48:58 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1873,7 +1873,11 @@
if (rp) {
/* a hit */
if (resolved)
+#if defined(MAKE_NATIVE) || defined(HAVE_STRLCPY)
strlcpy(resolved, rp, MAXPATHLEN);
+#else
+ strncpy(resolved, rp, MAXPATHLEN);
+#endif
else
resolved = bmake_strdup(rp);
} else {
Home |
Main Index |
Thread Index |
Old Index