Module Name: src
Committed By: riastradh
Date: Mon Feb 29 16:23:25 UTC 2016
Modified Files:
src/sbin/ifconfig: af_inet.c af_inet6.c
Log Message:
Consistently use estrlcpy for ifr.ifr_name here, not strncpy.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/ifconfig/af_inet6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.18 src/sbin/ifconfig/af_inet.c:1.19
--- src/sbin/ifconfig/af_inet.c:1.18 Thu Jan 7 11:32:21 2016
+++ src/sbin/ifconfig/af_inet.c Mon Feb 29 16:23:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.18 2016/01/07 11:32:21 roy Exp $ */
+/* $NetBSD: af_inet.c,v 1.19 2016/02/29 16:23:25 riastradh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.18 2016/01/07 11:32:21 roy Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.19 2016/02/29 16:23:25 riastradh Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -231,7 +231,7 @@ in_addr_flags(struct ifaddrs *ifa, int f
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
+ estrlcpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
ifr.ifr_addr = *ifa->ifa_addr;
if ((s = getsock(AF_INET)) == -1)
err(EXIT_FAILURE, "%s: getsock", __func__);
Index: src/sbin/ifconfig/af_inet6.c
diff -u src/sbin/ifconfig/af_inet6.c:1.34 src/sbin/ifconfig/af_inet6.c:1.35
--- src/sbin/ifconfig/af_inet6.c:1.34 Thu Jan 7 11:32:21 2016
+++ src/sbin/ifconfig/af_inet6.c Mon Feb 29 16:23:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet6.c,v 1.34 2016/01/07 11:32:21 roy Exp $ */
+/* $NetBSD: af_inet6.c,v 1.35 2016/02/29 16:23:25 riastradh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_inet6.c,v 1.34 2016/01/07 11:32:21 roy Exp $");
+__RCSID("$NetBSD: af_inet6.c,v 1.35 2016/02/29 16:23:25 riastradh Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -488,7 +488,7 @@ in6_addr_flags(struct ifaddrs *ifa, int
if ((s = getsock(AF_INET6)) == -1)
err(EXIT_FAILURE, "%s: getsock", __func__);
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
+ estrlcpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
ifr.ifr_addr = *(struct sockaddr_in6 *)ifa->ifa_addr;
if (prog_ioctl(s, SIOCGIFAFLAG_IN6, &ifr) == -1)
err(EXIT_FAILURE, "SIOCGIFAFLAG_IN6");
