Author: des
Date: Fri Mar  1 09:39:53 2013
New Revision: 247538
URL: http://svnweb.freebsd.org/changeset/base/247538

Log:
  MFH (r238602): add -g (gigabyte) flag

Modified:
  stable/9/usr.bin/du/du.1
  stable/9/usr.bin/du/du.c
Directory Properties:
  stable/9/usr.bin/du/   (props changed)

Modified: stable/9/usr.bin/du/du.1
==============================================================================
--- stable/9/usr.bin/du/du.1    Fri Mar  1 09:39:29 2013        (r247537)
+++ stable/9/usr.bin/du/du.1    Fri Mar  1 09:39:53 2013        (r247538)
@@ -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: stable/9/usr.bin/du/du.c
==============================================================================
--- stable/9/usr.bin/du/du.c    Fri Mar  1 09:39:29 2013        (r247537)
+++ stable/9/usr.bin/du/du.c    Fri Mar  1 09:39:53 2013        (r247538)
@@ -110,7 +110,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;
@@ -157,6 +157,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-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to