From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 22:30:01 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 31E051065672; Sun, 6 Nov 2011 22:30:01 +0000 (UTC) Date: Sun, 6 Nov 2011 22:30:01 +0000 From: Alexander Best To: Ed Schouten Message-ID: <20111106223001.GA91996@freebsd.org> References: <201111060815.pA68FIvC008341@svn.freebsd.org> <20111106204619.GA76768@freebsd.org> <20111106215630.GQ2258@hoeg.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="8t9RHnE3ZwKMSgU+" Content-Disposition: inline In-Reply-To: <20111106215630.GQ2258@hoeg.nl> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227164 - head/usr.bin/du X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 22:30:01 -0000 --8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun Nov 6 11, Ed Schouten wrote: > Hi Alexander, > > * Alexander Best , 20111106 21:46: > > this diff was flying around in my /usr/src, which makes some code a bit more > > readable. maybe this is something worth having in HEAD? > > Looks good. It seems we can also get rid of the `listall' variable here. > The rest of the code also uses the `*flag' variables, so there's no > reason why we can't just use `aflag'. Does this patch look good to you? loking good. :) i also found this man page update. cheers. alex > > -- > Ed Schouten > WWW: http://80386.nl/ --8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="du.1.diff" diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1 index ef8b5ac..f85cdf3 100644 --- a/usr.bin/du/du.1 +++ b/usr.bin/du/du.1 @@ -28,7 +28,7 @@ .\" @(#)du.1 8.2 (Berkeley) 4/1/94 .\" $FreeBSD$ .\" -.Dd November 6, 2008 +.Dd November 6, 2011 .Dt DU 1 .Os .Sh NAME @@ -65,7 +65,9 @@ Calculate block counts in .Ar blocksize byte blocks. This is different from the -.Fl k, m +.Fl k +and +.Fl m options or setting .Ev BLOCKSIZE and gives an estimate of how much space the examined file hierarchy would @@ -154,6 +156,25 @@ or .Fl L options are specified, storage used by any symbolic links which are followed is not counted or displayed. +.Pp +The +.Fl a, d +and +.Fl s +options are mutually exclusive. +.Pp +The +.Fl H, L +and +.Fl P +options are mutually exclusive. +.Pp +The +.Fl h, k +and +.Fl m +options all override each other; the last one specified determines +the block count used. .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE .It Ev BLOCKSIZE --8t9RHnE3ZwKMSgU+--