diff options
Diffstat (limited to 'bin/df')
| -rw-r--r-- | bin/df/df.c | 16 | ||||
| -rw-r--r-- | bin/df/ext2fs_df.c | 4 | ||||
| -rw-r--r-- | bin/df/lfs_df.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/bin/df/df.c b/bin/df/df.c index e227fbbfd3e..de2e283dc91 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.16 1997/06/16 04:37:49 denny Exp $ */ +/* $OpenBSD: df.c,v 1.17 1997/07/23 14:41:03 kstailey Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: df.c,v 1.16 1997/06/16 04:37:49 denny Exp $"; +static char rcsid[] = "$OpenBSD: df.c,v 1.17 1997/07/23 14:41:03 kstailey Exp $"; #endif #endif /* not lint */ @@ -125,7 +125,7 @@ main(argc, argv) mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); if (mntsize == 0) - err(1, "retrieving information on mounted file systems"); + err(1, "retrieving information on mounted file systems"); if (!*argv) { mntsize = regetmntinfo(&mntbuf, mntsize); @@ -149,13 +149,13 @@ main(argc, argv) * implement nflag here. */ if (!statfs(mntpt, &mntbuf[mntsize])) - if (lflag && (mntbuf[mntsize].f_flags & MNT_LOCAL) == 0) - warnx("%s is not a local file system", + if (lflag && (mntbuf[mntsize].f_flags & MNT_LOCAL) == 0) + warnx("%s is not a local file system", *argv); - else if (!selected(mntbuf[mntsize].f_fstypename)) - warnx("%s mounted as a %s file system", + else if (!selected(mntbuf[mntsize].f_fstypename)) + warnx("%s mounted as a %s file system", *argv, mntbuf[mntsize].f_fstypename); - else + else ++mntsize; else warn("%s", *argv); diff --git a/bin/df/ext2fs_df.c b/bin/df/ext2fs_df.c index a92e56053b4..623289a7a24 100644 --- a/bin/df/ext2fs_df.c +++ b/bin/df/ext2fs_df.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)ffs_vfsops.c 8.14 (Berkeley) 11/28/94 + * @(#)ffs_vfsops.c 8.14 (Berkeley) 11/28/94 */ #include <sys/param.h> @@ -89,7 +89,7 @@ e2fs_df(rfd, file, sfsp) ncg = howmany(sblock.e2fs_bcount - sblock.e2fs_first_dblock, sblock.e2fs_bpg); ngdb = howmany(ncg, sfsp->f_bsize / sizeof(struct ext2_gd)); - overhead_per_group = 1 /* super block */ + + overhead_per_group = 1 /* super block */ + ngdb + 1 /* block bitmap */ + 1 /* inode bitmap */ + diff --git a/bin/df/lfs_df.c b/bin/df/lfs_df.c index 34902cddf0a..3435e28b894 100644 --- a/bin/df/lfs_df.c +++ b/bin/df/lfs_df.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95 + * @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95 */ #include <sys/param.h> |