diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2009-06-03 15:15:17 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2009-06-03 15:15:17 +0000 |
| commit | 6635ebe91e629d3128cd6c4ffaad739ebeb92285 (patch) | |
| tree | 58cba453035bcb2b64f4ac18a83a7d525759521d /usr.bin/du | |
| parent | 7afb0f5c258fb83a307187d006c3ef3c535b5386 (diff) | |
If both -h and -k are specified, the latter takes precedence.
Prompted by jmc@, OK otto@
Diffstat (limited to 'usr.bin/du')
| -rw-r--r-- | usr.bin/du/du.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index 0674e069e4f..24306bb6ee5 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -1,4 +1,4 @@ -/* $OpenBSD: du.c,v 1.19 2006/01/25 06:20:03 tedu Exp $ */ +/* $OpenBSD: du.c,v 1.20 2009/06/03 15:15:16 millert Exp $ */ /* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */ /* @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; #else -static const char rcsid[] = "$OpenBSD: du.c,v 1.19 2006/01/25 06:20:03 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: du.c,v 1.20 2009/06/03 15:15:16 millert Exp $"; #endif #endif /* not lint */ @@ -103,9 +103,11 @@ main(int argc, char *argv[]) break; case 'h': hflag = 1; + kflag = 0; break; case 'k': kflag = 1; + hflag = 0; break; case 's': sflag = 1; |