summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2015-10-23 08:18:30 +0000
committertedu <tedu@openbsd.org>2015-10-23 08:18:30 +0000
commit54204f4834c76e31cbdb689a45e0dca886065280 (patch)
treed98f42bc4a304dee793c3c8d6496a39f716f62b3
parentsimplify backcompat. no more support for kernel or kmem on argv (diff)
downloadwireguard-openbsd-54204f4834c76e31cbdb689a45e0dca886065280.tar.xz
wireguard-openbsd-54204f4834c76e31cbdb689a45e0dca886065280.zip
cleanup argv handling a bit
-rw-r--r--usr.bin/nfsstat/nfsstat.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 878a0eed164..ab6f05ebd36 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfsstat.c,v 1.34 2015/01/16 06:40:10 deraadt Exp $ */
+/* $OpenBSD: nfsstat.c,v 1.35 2015/10/23 08:18:30 tedu Exp $ */
/* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */
/*
@@ -112,19 +112,13 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
-#define BACKWARD_COMPATIBILITY
-#ifdef BACKWARD_COMPATIBILITY
- if (*argv) {
+ if (argc) {
interval = (u_int)strtonum(*argv, 0, 1000, &errstr);
if (errstr)
errx(1, "invalid interval %s: %s", *argv, errstr);
- if (*++argv) {
- nlistf = *argv;
- if (*++argv)
- memf = *argv;
- }
+ ++argv;
+ --argc;
}
-#endif
if (nlistf || memf) {
char errbuf[_POSIX2_LINE_MAX];