From: Roy Marples <roy@marples.name>
Date: Tue, 2 Sep 2008 15:07:01 +0000 (+0000)
Subject: strncpy -> strlcpy.
X-Git-Tag: v5.0.0~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b24e47427238cfa1496a975befdee9a4f5668c8e;p=thirdparty%2Fdhcpcd.git

strncpy -> strlcpy.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index c450217e..96d8cf70 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -759,7 +759,7 @@ main(int argc, char **argv)
 	/* Saves calling fflush(stream) in the logger */
 	setlinebuf(stdout);
 	openlog(PACKAGE, LOG_PID, LOG_LOCAL0);
-	strncpy(cffile, CONFIG, sizeof(cffile));
+	strlcpy(cffile, CONFIG, sizeof(cffile));
 
 	/* Test for --help and --version */
 	if (argc > 1) {
diff --git a/net.c b/net.c
index 10612961..917d29ef 100644
--- a/net.c
+++ b/net.c
@@ -481,7 +481,7 @@ carrier_status(const char *ifname)
 #ifdef SIOCGIFMEDIA
 	if (retval == 1) {
 		memset(&ifmr, 0, sizeof(ifmr));
-		strncpy(ifmr.ifm_name, ifr.ifr_name, sizeof(ifmr.ifm_name));
+		strlcpy(ifmr.ifm_name, ifr.ifr_name, sizeof(ifmr.ifm_name));
 		if (ioctl(s, SIOCGIFMEDIA, &ifmr) != -1 &&
 		    ifmr.ifm_status & IFM_AVALID)
 		{