diff options
| author |   guenther <guenther@openbsd.org> | 2013-05-30 16:34:32 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2013-05-30 16:34:32 +0000 |
| commit | 3e12fe88c8c4646e7ae982a71d6b2ca04e4f0f9b (patch) | |
| tree | 0c1a09c06a16c4326ce3e8309be61fa984e3149f /bin/ls/print.c | |
| parent | remove lots of comments about locking per beck's request (diff) | |
| download | wireguard-openbsd-3e12fe88c8c4646e7ae982a71d6b2ca04e4f0f9b.tar.xz wireguard-openbsd-3e12fe88c8c4646e7ae982a71d6b2ca04e4f0f9b.zip | |
Fix column padding of inode numbers and block counts >2^32, as well as
display of directory block totals >2^32
ok tedu@
Diffstat (limited to 'bin/ls/print.c')
| -rw-r--r-- | bin/ls/print.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ls/print.c b/bin/ls/print.c index 031ea80c60d..57a0c111a22 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.29 2013/04/23 18:08:40 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.30 2013/05/30 16:34:32 guenther Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -83,7 +83,7 @@ printlong(DISPLAY *dp) char buf[20]; if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) - (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + (void)printf("total %llu\n", howmany(dp->btotal, blocksize)); for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) @@ -193,7 +193,7 @@ printcol(DISPLAY *dp) ++numrows; if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) - (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + (void)printf("total %llu\n", howmany(dp->btotal, blocksize)); for (row = 0; row < numrows; ++row) { for (base = row, col = 0;;) { chcnt = printaname(array[base], dp->s_inode, dp->s_block); @@ -274,7 +274,7 @@ printacol(DISPLAY *dp) return; if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) - (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + (void)printf("total %llu\n", howmany(dp->btotal, blocksize)); col = 0; for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) |