Author: des
Date: Wed Jul 18 19:28:22 2012
New Revision: 238602
URL: http://svn.freebsd.org/changeset/base/238602
Log:
Add -g (gigabyte) flag to complement -k (kilobyte) and -m (megabyte).
MFC after: 1 week
Modified:
head/usr.bin/du/du.1
head/usr.bin/du/du.c
Modified: head/usr.bin/du/du.1
==============================================================================
--- head/usr.bin/du/du.1 Wed Jul 18 18:10:27 2012 (r238601)
+++ head/usr.bin/du/du.1 Wed Jul 18 19:28:22 2012 (r238602)
@@ -28,7 +28,7 @@
.\" @(#)du.1 8.2 (Berkeley) 4/1/94
.\" $FreeBSD$
.\"
-.Dd December 17, 2011
+.Dd July 18, 2012
.Dt DU 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nm
.Op Fl Aclnx
.Op Fl H | L | P
-.Op Fl h | k | m
+.Op Fl g | h | k | m
.Op Fl a | s | d Ar depth
.Op Fl B Ar blocksize
.Op Fl I Ar mask
@@ -63,9 +63,9 @@ Calculate block counts in
.Ar blocksize
byte blocks.
This is different from the
-.Fl h, k
+.Fl h, k, m
and
-.Fl m
+.Fl g
options or setting
.Ev BLOCKSIZE
and gives an estimate of how much space the examined file hierarchy would
@@ -95,13 +95,15 @@ Display a grand total.
Display an entry for all files and directories
.Ar depth
directories deep.
+.It Fl g
+Display block counts in 1073741824-byte (1 GiB) blocks.
.It Fl h
.Dq Human-readable
output.
Use unit suffixes: Byte, Kilobyte, Megabyte,
Gigabyte, Terabyte and Petabyte.
.It Fl k
-Display block counts in 1024-byte (1-Kbyte) blocks.
+Display block counts in 1024-byte (1 kiB) blocks.
.It Fl l
If a file has multiple hard links, count its size multiple times.
The default behavior of
@@ -112,7 +114,7 @@ When the
option is specified, the hard link checks are disabled, and these files
are counted (and displayed) as many times as they are found.
.It Fl m
-Display block counts in 1048576-byte (1-Mbyte) blocks.
+Display block counts in 1048576-byte (1 MiB) blocks.
.It Fl n
Ignore files and directories with user
.Dq nodump
Modified: head/usr.bin/du/du.c
==============================================================================
--- head/usr.bin/du/du.c Wed Jul 18 18:10:27 2012 (r238601)
+++ head/usr.bin/du/du.c Wed Jul 18 19:28:22 2012 (r238602)
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
depth = INT_MAX;
SLIST_INIT(&ignores);
- while ((ch = getopt(argc, argv, "AB:HI:LPasd:chklmnrt:x")) != -1)
+ while ((ch = getopt(argc, argv, "AB:HI:LPasd:cghklmnrt:x")) != -1)
switch (ch) {
case 'A':
Aflag = 1;
@@ -156,6 +156,10 @@ main(int argc, char *argv[])
case 'c':
cflag = 1;
break;
+ case 'g':
+ hflag = 0;
+ blocksize = 1073741824;
+ break;
case 'h':
hflag = 1;
break;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
