Module Name: src
Committed By: dholland
Date: Mon May 30 17:26:29 UTC 2016
Modified Files:
src/bin/ls: ls.c
Log Message:
PR 50997 David Binderman: fix format strings
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/bin/ls/ls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ls/ls.c
diff -u src/bin/ls/ls.c:1.74 src/bin/ls/ls.c:1.75
--- src/bin/ls/ls.c:1.74 Wed Apr 2 10:55:47 2014
+++ src/bin/ls/ls.c Mon May 30 17:26:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.74 2014/04/02 10:55:47 wiz Exp $ */
+/* $NetBSD: ls.c,v 1.75 2016/05/30 17:26:29 dholland Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
#else
-__RCSID("$NetBSD: ls.c,v 1.74 2014/04/02 10:55:47 wiz Exp $");
+__RCSID("$NetBSD: ls.c,v 1.75 2016/05/30 17:26:29 dholland Exp $");
#endif
#endif /* not lint */
@@ -631,7 +631,7 @@ display(FTSENT *p, FTSENT *list)
if (f_humanize) {
d.s_block = 4; /* min buf length for humanize_number */
} else {
- (void)snprintf(buf, sizeof(buf), "%llu",
+ (void)snprintf(buf, sizeof(buf), "%lld",
(long long)howmany(maxblock, blocksize));
d.s_block = strlen(buf);
if (f_commas) /* allow for commas before every third digit */
@@ -647,7 +647,7 @@ display(FTSENT *p, FTSENT *list)
if (f_humanize) {
d.s_size = 4; /* min buf length for humanize_number */
} else {
- (void)snprintf(buf, sizeof(buf), "%llu",
+ (void)snprintf(buf, sizeof(buf), "%lld",
(long long)maxsize);
d.s_size = strlen(buf);
if (f_commas) /* allow for commas before every third digit */
@@ -655,9 +655,9 @@ display(FTSENT *p, FTSENT *list)
}
d.s_user = maxuser;
if (bcfile) {
- (void)snprintf(buf, sizeof(buf), "%u", maxmajor);
+ (void)snprintf(buf, sizeof(buf), "%d", maxmajor);
d.s_major = strlen(buf);
- (void)snprintf(buf, sizeof(buf), "%u", maxminor);
+ (void)snprintf(buf, sizeof(buf), "%d", maxminor);
d.s_minor = strlen(buf);
if (d.s_major + d.s_minor + 2 > d.s_size)
d.s_size = d.s_major + d.s_minor + 2;
