Author: dougb
Date: Sat Dec 18 00:30:52 2010
New Revision: 216512
URL: http://svn.freebsd.org/changeset/base/216512
Log:
Bring in the relevant changes from NetBSD's 1.31:
"Use strlcpy, not strncpy, when the desired semantics are strlcpy's
rather than strncpy's."
Note: NetBSD's 1.32 is their adoption of our r216206
Obtained from: dholl...@netbsd.org
Modified:
head/usr.bin/stat/stat.c
Modified: head/usr.bin/stat/stat.c
==============================================================================
--- head/usr.bin/stat/stat.c Fri Dec 17 22:41:22 2010 (r216511)
+++ head/usr.bin/stat/stat.c Sat Dec 18 00:30:52 2010 (r216512)
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if 0
#ifndef lint
-__RCSID("$NetBSD: stat.c,v 1.30 2010/11/25 04:33:30 dholland Exp $"
+__RCSID("$NetBSD: stat.c,v 1.31 2010/12/16 05:30:16 dholland Exp $"
"$OpenBSD: stat.c,v 1.14 2009/06/24 09:44:25 sobrado Exp $");
#endif
#endif
@@ -789,7 +789,7 @@ format1(const struct stat *st,
small = 0;
data = 0;
if (file == NULL) {
- (void)strncpy(path, "(stdin)", sizeof(path));
+ (void)strlcpy(path, "(stdin)", sizeof(path));
sdata = path;
} else {
snprintf(path, sizeof(path), " -> ");
@@ -877,7 +877,7 @@ format1(const struct stat *st,
case SHOW_filename:
small = 0;
data = 0;
- (void)strncpy(path, file, sizeof(path));
+ (void)strlcpy(path, file, sizeof(path));
sdata = path;
formats = FMTF_STRING;
if (ofmt == 0)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
