Module Name: src
Committed By: snj
Date: Tue Jun 9 17:35:38 UTC 2009
Modified Files:
src/bin/df [netbsd-5]: df.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #797):
bin/df/df.c: revision 1.86
block numbers are measured in f_frsize units. Make -P option
use this instead of f_bsize. Also account for reserved blocks
like normal non-P output.
Fixes PR bin/41541.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.83.4.1 src/bin/df/df.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/df/df.c
diff -u src/bin/df/df.c:1.83 src/bin/df/df.c:1.83.4.1
--- src/bin/df/df.c:1.83 Sun Jul 20 00:52:39 2008
+++ src/bin/df/df.c Tue Jun 9 17:35:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: df.c,v 1.83.4.1 2009/06/09 17:35:38 snj Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $");
+__RCSID("$NetBSD: df.c,v 1.83.4.1 2009/06/09 17:35:38 snj Exp $");
#endif
#endif /* not lint */
@@ -473,9 +473,9 @@
*/
(void)printf("%s %" PRId64 " %" PRId64 " %" PRId64 " %s %s\n",
sfsp->f_mntfromname,
- fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
- fsbtoblk(used, sfsp->f_bsize, blocksize),
- fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize),
+ fsbtoblk(sfsp->f_blocks, sfsp->f_frsize, blocksize),
+ fsbtoblk(used, sfsp->f_frsize, blocksize),
+ fsbtoblk(bavail, sfsp->f_frsize, blocksize),
availblks == 0 ? full : strpct64((uint64_t) used,
(uint64_t) availblks, 0), sfsp->f_mntonname);
/*
