1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-19 02:29:40 +00:00

Bring in the change from NetBSD 1.22:

"Fix a trivial truncation case, and eliminate a corner case that might
print a nul character."

I am purposely bypassing the following versions:
1.19	A build infrastructure change that does not apply to us
1.20	A feature I am not interested in, but don't object if someone else
	wants to pick it up
1.21	A build infrastructure change that does not apply to us

Obtained from:	atatat@NetBSD.org
This commit is contained in:
Doug Barton 2010-12-05 20:47:53 +00:00
parent 5af61b5251
commit 578800b575
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=216202

View File

@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if 0
#ifndef lint
__RCSID("$NetBSD: stat.c,v 1.18 2004/05/28 04:48:31 atatat Exp $");
__RCSID("$NetBSD: stat.c,v 1.22 2005/04/22 03:36:48 atatat Exp $");
#endif
#endif
@ -381,7 +381,7 @@ output(const struct stat *st, const char *file,
const char *statfmt, int fn, int nonl, int quiet)
{
int flags, size, prec, ofmt, hilo, what;
char buf[PATH_MAX];
char buf[PATH_MAX + 4 + 1];
const char *subfmt;
int nl, t, i;
@ -550,7 +550,7 @@ output(const struct stat *st, const char *file,
buf, sizeof(buf),
flags, size, prec, ofmt, hilo, what);
for (i = 0; i < t && i < sizeof(buf); i++)
for (i = 0; i < t && i < sizeof(buf) - 1; i++)
addchar(stdout, buf[i], &nl);
continue;