diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2006-10-29 19:20:02 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2006-10-29 19:20:02 +0000 |
| commit | e8f1951ea8a2a74d889dad34ffb985fd66d2707d (patch) | |
| tree | ea0a469fe36147d1f1948e19dde6fb2f18edb903 /bin/df | |
| parent | 7d04a976ffd1977f8336d3f5960e5a2907e4f32c (diff) | |
like -i, -h is incompatible with -P; suggested by jmc@; ok ray@
Diffstat (limited to 'bin/df')
| -rw-r--r-- | bin/df/df.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/df/df.c b/bin/df/df.c index b329344fcc1..acbeb334a6d 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.45 2006/09/21 20:06:33 pedro Exp $ */ +/* $OpenBSD: df.c,v 1.46 2006/10/29 19:20:01 otto Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: df.c,v 1.45 2006/09/21 20:06:33 pedro Exp $"; +static char rcsid[] = "$OpenBSD: df.c,v 1.46 2006/10/29 19:20:01 otto Exp $"; #endif #endif /* not lint */ @@ -127,8 +127,8 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (iflag && Pflag) { - warnx("-i is incompatible with -P"); + if ((iflag || hflag) && Pflag) { + warnx("-h and -i are incompatible with -P"); usage(); } |