summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/create
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2003-10-04 00:50:34 +0000
committerwiz <wiz@NetBSD.org>2003-10-04 00:50:34 +0000
commitc87a7072e85ae63d7e0731daf8d6b63174c19d96 (patch)
treecbce2b3e1710505863f0fa389162f29d4a6514e7 /usr.sbin/pkg_install/create
parentc4beb9648d466004a5413cce893a7116cb3324e0 (diff)
Replace strnncpy calls with strlcpy calls. Remove strnncpy.
Ok'ed by agc and hubertf. Verified working with editors/mule package.
Diffstat (limited to 'usr.sbin/pkg_install/create')
-rw-r--r--usr.sbin/pkg_install/create/pl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 6f0993a3cb8..c1042b43f1e 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,11 +1,11 @@
-/* $NetBSD: pl.c,v 1.28 2003/09/02 07:34:54 jlam Exp $ */
+/* $NetBSD: pl.c,v 1.29 2003/10/04 00:50:34 wiz Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp";
#else
-__RCSID("$NetBSD: pl.c,v 1.28 2003/09/02 07:34:54 jlam Exp $");
+__RCSID("$NetBSD: pl.c,v 1.29 2003/10/04 00:50:34 wiz Exp $");
#endif
#endif
@@ -53,10 +53,10 @@ CheckSymlink(char *name, char *prefix, size_t prefixcc)
for (slashc = 0, slash = &name[prefixcc + 1]; (slash = strchr(slash, '/')) != (char *) NULL; slash++, slashc++) {
}
for (cc = i = 0; i < slashc; i++) {
- strnncpy(&newtgt[cc], sizeof(newtgt) - cc, "../", 3);
+ strlcpy(&newtgt[cc], "../", sizeof(newtgt) - cc);
cc += 3;
}
- strnncpy(&newtgt[cc], sizeof(newtgt) - cc, &oldtgt[prefixcc + 1], strlen(&oldtgt[prefixcc + 1]));
+ strlcpy(&newtgt[cc], &oldtgt[prefixcc + 1], sizeof(newtgt) - cc);
(void) fprintf(stderr, "Full pathname symlink `%s' is target of `%s' - adjusting to `%s'\n", oldtgt, name, newtgt);
if (unlink(name) != 0) {
warn("can't unlink `%s'", name);