diff options
| author | Karel Zak | 2017-06-26 13:42:25 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-06-26 13:42:25 +0200 |
| commit | c525260293279acf7ebf116d0b402e47f7a6a17c (patch) | |
| tree | 0038041fc4c0838aa72aec7d812968d918dbef8d /sys-utils/dmesg.c | |
| parent | agetty: fix login name DEL/CTRL^U issue (diff) | |
| parent | misc: no more errtryh() (diff) | |
| download | kernel-qcow2-util-linux-c525260293279acf7ebf116d0b402e47f7a6a17c.tar.gz kernel-qcow2-util-linux-c525260293279acf7ebf116d0b402e47f7a6a17c.tar.xz kernel-qcow2-util-linux-c525260293279acf7ebf116d0b402e47f7a6a17c.zip | |
Merge branch 'usage-part1' of https://github.com/rudimeier/util-linux
* 'usage-part1' of https://github.com/rudimeier/util-linux:
misc: no more errtryh()
mkfs.cramfs: add --help and --version
more: add --help and --version
whereis: add --help and --version
login: add --help and --version
fsck: add --help and --version
setarch: use errtryhelp()
dmesg: do not accept any non-option arguments
blkid: use errtryhelp instead of errtryh
misc: remove superfluous null pointer checks for optarg
uuidd: remove unused define
Diffstat (limited to 'sys-utils/dmesg.c')
| -rw-r--r-- | sys-utils/dmesg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 821d8bbb2..37639ebe5 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -1486,10 +1486,8 @@ int main(int argc, char *argv[]) errtryhelp(EXIT_FAILURE); } } - argc -= optind; - argv += optind; - if (argc > 1) + if (argc != optind) usage(stderr); if ((is_timefmt(&ctl, RELTIME) || |