From d4262d57368f86161a4cf5175180039a806612a0 Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Sun, 19 May 2019 07:33:29 -0500 Subject: bin/df: rewrite --- bin/df/df.1 | 175 ++++++++++++++++-------------------------------------------- 1 file changed, 46 insertions(+), 129 deletions(-) (limited to 'bin/df/df.1') diff --git a/bin/df/df.1 b/bin/df/df.1 index 6ac5ed0..3cc44db 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -2,6 +2,8 @@ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2019 +.\" Adélie Userland Team. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -37,9 +39,8 @@ .Nd display free disk space .Sh SYNOPSIS .Nm -.Op Fl agln -.Op Fl Ghkm | Fl ihkm | Fl Pk -.Op Fl t Ar type +.Op Fl hks | Fl Pk +.Op Fl t .Op Ar file | Ar file_system ... .Sh DESCRIPTION .Nm @@ -54,153 +55,69 @@ If neither a file or a operand is specified, statistics for all mounted file systems are displayed (subject to the -.Fl l -and .Fl t -options below). -.Pp -Note that the printed count of available blocks takes -.Va minfree -into account, and thus will be negative when the number of free blocks -on the filesystem is less than -.Va minfree . +option below). .Pp The following options are available: .Bl -tag -width Ds -.It Fl a -Show all mount points, -including those that were mounted with the -.Dv MNT_IGNORE -flag. -.It Fl G -Display all the fields of the structure(s) returned by -.Xr statvfs 2 . -This option cannot be used with the -.Fl i -or -.Fl P -options, and it is modelled after the Solaris -.Fl g -option. -This option will override the -.Fl g , -.Fl h , -.Fl k , -and -.Fl m -options, as well as any setting of -.Ev BLOCKSIZE . -.It Fl g -The -.Fl g -option causes the numbers to be reported in gigabytes (1024*1024*1024 -bytes). .It Fl h "Human-readable" output. -Use unit suffixes: Byte, Kilobyte, Megabyte, -Gigabyte, Terabyte, Petabyte, Exabyte in order to reduce the number of -digits to four or less. -.It Fl i -Include statistics on the number of free inodes. +Use powers of 1024 to reduce the number of digits to four or less, via +the IEEE prefixes (byte, kibibyte, mebibyte, and so on). This option +conflicts with the +.Fl k +and +.Fl s +options. .It Fl k By default, all sizes are reported in 512-byte block counts. The .Fl k option causes the numbers to be reported in kilobytes (1024 bytes). -.It Fl l -Display statistics only about mounted file systems with the -.Dv MNT_LOCAL -flag set. -If a non-local file system is given as an argument, a -warning is issued and no information is given on that file system. -.It Fl m -The -.Fl m -option causes the numbers to be reported in megabytes (1024*1024 bytes). -.It Fl n -Print out the previously obtained statistics from the file systems. -This option should be used if it is possible that one or more -file systems are in a state such that they will not be able to provide -statistics without a long delay. -When this option is specified, -.Nm -will not request new statistics from the file systems, but will respond -with the possibly stale statistics that were previously obtained. -.It Fl P -Produce output in the following portable format: -.Pp -If both the -.Fl P +This option conflicts with the +.Fl h and -.Fl k -option are specified, the output will be preceded by the following header -line, formatted to match the data following it: -.Bd -literal -"Filesystem 1024-blocks Used Available Capacity Mounted on\en" -.Ed -.Pp -If the -.Fl P -option is specified without the -.Fl k -options, the output will be preceded by the following header line, -formatted to match the data following it: -.Bd -literal -"Filesystem -blocks Used Available Capacity Mounted on\en" -.Ed -.Pp -The header line is followed by data formatted as follows: +.Fl s +options. +.It Fl P +Produce POSIX-compliant output, which is described as the following: .Bd -literal +"Filesystem -blocks Used Available Capacity Mounted On\en" "%s %d %d %d %d%% %s\en", , , , , , .Ed -.Pp -Note that the -.Fl i -option may not be specified with -.Fl P . -.It Fl t Ar type -Is used to indicate the actions should only be taken on -filesystems of the specified type. -More than one type may be specified in a comma-separated list. -The list of filesystem types can be prefixed with -.Dq no -to specify the filesystem types for which action should -.Em not -be taken. -If a file system is given on the command line that is not of -the specified type, a warning is issued and no information is given on -that file system. -.El -.Sh ENVIRONMENT -.Bl -tag -width BLOCKSIZE -.It Ev BLOCKSIZE -If the environment variable -.Ev BLOCKSIZE -is set, and the -.Fl g , -.Fl h , +Note that 'blksize' is 512 by default, and may be changed to 1024 via +the .Fl k +option. No other options may be specified alongside the +.Fl P +option. +.It Fl s +"Human readable" output. +Use SI units (powers of 1000) to reduce the number of digits to four +or less (byte, kilobyte, megabyte, and so on). This option conflicts +with the +.Fl h and -.Fl m -options are not specified, the block counts will be displayed in units of that -size block. +.Fl k +options. +.It Fl t +Show the type of the filesystems listed. This option cannot be used +with the +.Fl P +option. .El +.Sh CONFORMANCE +This implementation of +.Nm +is fully conformant with POSIX.1-2017, with two extensions inspired by +GNU coreutils. .Sh SEE ALSO -.Xr quota 1 , .Xr fstatvfs 2 , -.Xr getvfsstat 2 , +.Xr mount 2 , .Xr statvfs 2 , -.Xr getbsize 3 , -.Xr getmntinfo 3 , +.Xr setmntent 3 , +.Xr getmntent 3 , .Xr fs 5 , -.Xr fstab 5 , -.Xr mount 8 , -.Xr quot 8 , -.Xr tunefs 8 -.Sh HISTORY -A -.Nm -utility appeared in -.At v1 . +.Xr fstab 5 -- cgit v1.2.3-70-g09d2