diff options
| author | dougb <dougb@FreeBSD.org> | 2010-12-18 00:30:52 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-12-18 00:30:52 +0000 |
| commit | 58fb6da17e4628475e3b620f9ca711c09b2a1bca (patch) | |
| tree | d44e7eb13c5c5b525c7323f602ac3bc507b62686 /usr.bin/stat | |
| parent | 303f816df2775b26995e491e0f85a92ece216376 (diff) | |
| download | FreeBSD-src-58fb6da17e4628475e3b620f9ca711c09b2a1bca.zip FreeBSD-src-58fb6da17e4628475e3b620f9ca711c09b2a1bca.tar.gz | |
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: dholland@NetBSD.org
Diffstat (limited to 'usr.bin/stat')
| -rw-r--r-- | usr.bin/stat/stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index f661f30..b2ba03f 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -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) |
