diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:07:41 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:07:41 +0100 |
| commit | 03aa1e26b8885cd0ae28b676bed0e646e93433fb (patch) | |
| tree | 6ea4dd81cc9fb84c7da3a42731363144ee7ff0c3 /util-linux | |
| parent | 2e04fb569646e1882496f7175a1f5da6f33e36e1 (diff) | |
| parent | 6bbb48fadf2265c7ed806027781da8039e561865 (diff) | |
| download | busybox-w32-03aa1e26b8885cd0ae28b676bed0e646e93433fb.tar.gz busybox-w32-03aa1e26b8885cd0ae28b676bed0e646e93433fb.tar.bz2 busybox-w32-03aa1e26b8885cd0ae28b676bed0e646e93433fb.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
| -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 4812f1bc5..f6923efda 100644 --- a/util-linux/more.c +++ b/util-linux/more.c | |||
| @@ -76,7 +76,16 @@ int more_main(int argc UNUSED_PARAM, char **argv) | |||
| 76 | 76 | ||
| 77 | INIT_G(); | 77 | INIT_G(); |
| 78 | 78 | ||
| 79 | argv++; | 79 | /* Parse options */ |
| 80 | /* Accepted but ignored: */ | ||
| 81 | /* -d Display help instead of ringing bell is pressed */ | ||
| 82 | /* -f Count logical lines (IOW: long lines are not folded) */ | ||
| 83 | /* -l Do not pause after any line containing a ^L (form feed) */ | ||
| 84 | /* -s Squeeze blank lines into one */ | ||
| 85 | /* -u Suppress underlining */ | ||
| 86 | getopt32(argv, "dflsu"); | ||
| 87 | argv += optind; | ||
| 88 | |||
| 80 | /* Another popular pager, most, detects when stdout | 89 | /* Another popular pager, most, detects when stdout |
| 81 | * is not a tty and turns into cat. This makes sense. */ | 90 | * is not a tty and turns into cat. This makes sense. */ |
| 82 | if (!isatty(STDOUT_FILENO)) | 91 | if (!isatty(STDOUT_FILENO)) |