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 /util-linux/more.c | |
| parent | 3720a61daf2e03e42e34902c2636ce3e3d6b8485 (diff) | |
| download | busybox-w32-713b5133534d4bd4cfb49caba85eb3f655b6d8fd.tar.gz busybox-w32-713b5133534d4bd4cfb49caba85eb3f655b6d8fd.tar.bz2 busybox-w32-713b5133534d4bd4cfb49caba85eb3f655b6d8fd.zip | |
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>
Diffstat (limited to 'util-linux/more.c')
| -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) | |||
| 73 | 73 | ||
| 74 | INIT_G(); | 74 | INIT_G(); |
| 75 | 75 | ||
| 76 | argv++; | 76 | /* Parse options */ |
| 77 | /* Accepted but ignored: */ | ||
| 78 | /* -d Display help instead of ringing bell is pressed */ | ||
| 79 | /* -f Count logical lines (IOW: long lines are not folded) */ | ||
| 80 | /* -l Do not pause after any line containing a ^L (form feed) */ | ||
| 81 | /* -s Squeeze blank lines into one */ | ||
| 82 | /* -u Suppress underlining */ | ||
| 83 | getopt32(argv, "dflsu"); | ||
| 84 | argv += optind; | ||
| 85 | |||
| 77 | /* Another popular pager, most, detects when stdout | 86 | /* Another popular pager, most, detects when stdout |
| 78 | * is not a tty and turns into cat. This makes sense. */ | 87 | * is not a tty and turns into cat. This makes sense. */ |
| 79 | if (!isatty(STDOUT_FILENO)) | 88 | if (!isatty(STDOUT_FILENO)) |