diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /procps/iostat.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/iostat.c')
| -rw-r--r-- | procps/iostat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/procps/iostat.c b/procps/iostat.c index 6a39c324f..050625f57 100644 --- a/procps/iostat.c +++ b/procps/iostat.c | |||
| @@ -418,8 +418,7 @@ int iostat_main(int argc UNUSED_PARAM, char **argv) | |||
| 418 | 418 | ||
| 419 | /* Parse and process arguments */ | 419 | /* Parse and process arguments */ |
| 420 | /* -k and -m are mutually exclusive */ | 420 | /* -k and -m are mutually exclusive */ |
| 421 | opt_complementary = "k--m:m--k"; | 421 | opt = getopt32(argv, "^" "cdtzkm" "\0" "k--m:m--k"); |
| 422 | opt = getopt32(argv, "cdtzkm"); | ||
| 423 | if (!(opt & (OPT_c + OPT_d))) | 422 | if (!(opt & (OPT_c + OPT_d))) |
| 424 | /* Default is -cd */ | 423 | /* Default is -cd */ |
| 425 | opt |= OPT_c + OPT_d; | 424 | opt |= OPT_c + OPT_d; |