d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify getopt switch parsing.

Browse Source 
Only one of these flags can be set. Just add them together and check the
value. Also, get rid of the listall variable. The code is already filled
with direct *flag-comparisons.

Obtained from:	Alexander Best (though modified)
This commit is contained in:
ed 2011-11-08 11:36:46 +00:00
parent 8e918ec439
commit c2950f3c9c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/du/du.c
View File

@ -88,7 +88,6 @@ main(int argc, char *argv[])
off_t savednumber, curblocks;
off_t threshold, threshold_sign;
int ftsoptions;
int listall;
int depth;
int Hflag, Lflag, Pflag, aflag, sflag, dflag, cflag;
int hflag, lflag, ch, notused, rval;
@ -229,17 +228,10 @@ main(int argc, char *argv[])
if (!Aflag && (cblocksize % DEV_BSIZE) != 0)
cblocksize = howmany(cblocksize, DEV_BSIZE) * DEV_BSIZE;
listall = 0;
if (aflag) {
if (sflag || dflag)
usage();
listall = 1;
} else if (sflag) {
if (dflag)
usage();
if (aflag + dflag + sflag > 1)
usage();
if (sflag)
depth = 0;
}
if (!*argv) {
argv = save;
@ -320,7 +312,7 @@ main(int argc, char *argv[])
howmany(p->fts_statp->st_size, cblocksize) :
howmany(p->fts_statp->st_blocks, cblocksize);
if (listall || p->fts_level == 0) {
if (aflag || p->fts_level == 0) {
if (hflag) {
prthumanval(curblocks);
(void)printf("\t%s\n", p->fts_path);