diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-10-11 15:29:38 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-10-11 15:29:38 +0200 |
| commit | 713b5133534d4bd4cfb49caba85eb3f655b6d8fd (patch) | |
| tree | 86b68325ae0c4eef6e8366e4287cee95ea00c1b5 | |
| parent | 3720a61daf2e03e42e34902c2636ce3e3d6b8485 (diff) | |
| download | busybox-713b5133534d4bd4cfb49caba85eb3f655b6d8fd.tar.gz | |
more: accept and ignore a bunch of options
Alpine Linux stumbled over "more -s":
http://bugs.alpinelinux.org/issues/5190
function old new delta
more_main 857 872 +15
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | util-linux/more.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/util-linux/more.c b/util-linux/more.c index 95cbdd994..07836e29d 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -73,7 +73,16 @@ int more_main(int argc UNUSED_PARAM, char **argv) INIT_G(); - argv++; + /* Parse options */ + /* Accepted but ignored: */ + /* -d Display help instead of ringing bell is pressed */ + /* -f Count logical lines (IOW: long lines are not folded) */ + /* -l Do not pause after any line containing a ^L (form feed) */ + /* -s Squeeze blank lines into one */ + /* -u Suppress underlining */ + getopt32(argv, "dflsu"); + argv += optind; + /* Another popular pager, most, detects when stdout * is not a tty and turns into cat. This makes sense. */ if (!isatty(STDOUT_FILENO)) |