Sync bin/df with NetBSD-8

closes #270

Change-Id: Ide8717d095ed8e8ae7c942470f2af8c6a169fcc0

diff --git a/bin/df/df.1 b/bin/df/df.1
index 184f47a0aa4107d317aa9d3e085839441604f3fc..63f7d4e23b54b8ae3faa73795239d018e75ea470 100644 (file)
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\"    $NetBSD: df.1,v 1.46 2016/08/10 23:48:14 sevan Exp $
+.\"    $NetBSD: df.1,v 1.46.6.1 2018/08/28 13:21:42 martin Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"    @(#)df.1        8.2 (Berkeley) 1/13/92
 .\"
-.Dd August 10, 2016
+.Dd August 27, 2018
 .Dt DF 1
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm
-.Op Fl agklmn
-.Op Fl G | Fl i | Fl P
+.Op Fl agln
+.Op Fl Ghkm | Fl ihkm | Fl Pk
 .Op Fl t Ar type
 .Op Ar file | Ar file_system ...
 .Sh DESCRIPTION

diff --git a/bin/df/df.c b/bin/df/df.c
index d3615741196f590f25fb092d4f64aa49e23875aa..ad7ba3687de2a57fa640d41b95bf471cba29e59d 100644 (file)
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: df.c,v 1.90 2012/01/07 18:45:13 christos Exp $ */
+/*     $NetBSD: df.c,v 1.92.8.1 2018/08/28 13:21:42 martin Exp $ */
 
 /*
  * Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)df.c       8.7 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: df.c,v 1.90 2012/01/07 18:45:13 christos Exp $");
+__RCSID("$NetBSD: df.c,v 1.92.8.1 2018/08/28 13:21:42 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -379,13 +379,13 @@ prtstat(struct statvfs *sfsp, int maxwidth)
                 */
                (void)printf("%10s (%-12s): %7ld block size %12ld frag size\n",
                    sfsp->f_mntonname, sfsp->f_mntfromname,
-                   sfsp->f_iosize,     /* On UFS/FFS systems this is
+                   sfsp->f_bsize,      /* On UFS/FFS systems this is
                                         * also called the "optimal
                                         * transfer block size" but it
                                         * is of course the file
                                         * system's block size too.
                                         */
-                   sfsp->f_bsize);     /* not so surprisingly the
+                   sfsp->f_frsize);    /* not so surprisingly the
                                         * "fundamental file system
                                         * block size" is the frag
                                         * size.
@@ -499,7 +499,7 @@ prtstat(struct statvfs *sfsp, int maxwidth)
        if (iflag) {
                inodes = sfsp->f_files;
                used = inodes - sfsp->f_ffree;
-               (void)printf(" %8jd %8jd %3s%%",
+               (void)printf(" %8jd %8jd %4s%%",
                    (intmax_t)used, (intmax_t)sfsp->f_ffree,
                    inodes == 0 ? (used == 0 ? empty : full) :
                    strspct(pb, sizeof(pb), used, inodes, 0));
@@ -512,7 +512,7 @@ usage(void)
 {
 
        (void)fprintf(stderr,
-           "Usage: %s [-aGgln] [-hkm|-ihkm|-Pk] [-t type] [file | "
+           "Usage: %s [-agln] [-Ghkm|-ihkm|-Pk] [-t type] [file | "
            "file_system ...]\n",
            getprogname());
        exit(1);