oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync bin/df with NetBSD-8

Browse Source 
closes #270

Change-Id: Ide8717d095ed8e8ae7c942470f2af8c6a169fcc0
This commit is contained in:
Sevan Janiyan 2018-11-01 23:18:35 +00:00 committed by Lionel Sambuc
parent 02efe53e8c
commit 92435d6dd9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/df/df.1
View File

@ -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 .\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved. .\" The Regents of the University of California. All rights reserved.
@ -29,7 +29,7 @@
.\" .\"
.\" @(#)df.1 8.2 (Berkeley) 1/13/92 .\" @(#)df.1 8.2 (Berkeley) 1/13/92
.\" .\"
.Dd August 10, 2016 .Dd August 27, 2018
.Dt DF 1 .Dt DF 1
.Os .Os
.Sh NAME .Sh NAME
@ -37,8 +37,8 @@
.Nd display free disk space .Nd display free disk space
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl agklmn .Op Fl agln
.Op Fl G | Fl i | Fl P .Op Fl Ghkm | Fl ihkm | Fl Pk
.Op Fl t Ar type .Op Fl t Ar type
.Op Ar file | Ar file_system ... .Op Ar file | Ar file_system ...
.Sh DESCRIPTION .Sh DESCRIPTION

12
bin/df/df.c
View File

@ -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 * Copyright (c) 1980, 1990, 1993, 1994
@ -45,7 +45,7 @@ __COPYRIGHT(
#if 0 #if 0
static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
#else #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
#endif /* not lint */ #endif /* not lint */
@ -379,13 +379,13 @@ prtstat(struct statvfs *sfsp, int maxwidth)
*/ */
(void)printf("%10s (%-12s): %7ld block size %12ld frag size\n", (void)printf("%10s (%-12s): %7ld block size %12ld frag size\n",
sfsp->f_mntonname, sfsp->f_mntfromname, 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 * also called the "optimal
* transfer block size" but it * transfer block size" but it
* is of course the file * is of course the file
* system's block size too. * system's block size too.
*/ */
sfsp->f_bsize); /* not so surprisingly the sfsp->f_frsize); /* not so surprisingly the
* "fundamental file system * "fundamental file system
* block size" is the frag * block size" is the frag
* size. * size.
@ -499,7 +499,7 @@ prtstat(struct statvfs *sfsp, int maxwidth)
if (iflag) { if (iflag) {
inodes = sfsp->f_files; inodes = sfsp->f_files;
used = inodes - sfsp->f_ffree; used = inodes - sfsp->f_ffree;
(void)printf(" %8jd %8jd %3s%%", (void)printf(" %8jd %8jd %4s%%",
(intmax_t)used, (intmax_t)sfsp->f_ffree, (intmax_t)used, (intmax_t)sfsp->f_ffree,
inodes == 0 ? (used == 0 ? empty : full) : inodes == 0 ? (used == 0 ? empty : full) :
strspct(pb, sizeof(pb), used, inodes, 0)); strspct(pb, sizeof(pb), used, inodes, 0));
@ -512,7 +512,7 @@ usage(void)
{ {
(void)fprintf(stderr, (void)fprintf(stderr,
"Usage: %s [-aGgln] [-hkm|-ihkm|-Pk] [-t type] [file | " "Usage: %s [-agln] [-Ghkm|-ihkm|-Pk] [-t type] [file | "
"file_system ...]\n", "file_system ...]\n",
getprogname()); getprogname());
exit(1); exit(1);