aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-03-01 15:37:12 +0000
committerRon Yorston <rmy@pobox.com>2018-03-01 15:37:12 +0000
commit5b726f8a78c33e117c2a968739b1b4a6964905f8 (patch)
treeaf063c6bf3e99b7480c2fad2dffc2a76c09cb5e0 /miscutils
parent5f8dac68690e92f0be220f8f8d9f797a2aedc806 (diff)
parentcc222747ae7e264cbe9b1c8a9c253860275db8a9 (diff)
downloadbusybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.gz
busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.bz2
busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/less.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index 41e4989ad..e4885db77 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -1890,7 +1890,11 @@ int less_main(int argc, char **argv)
1890 * -s: condense many empty lines to one 1890 * -s: condense many empty lines to one
1891 * (used by some setups for manpage display) 1891 * (used by some setups for manpage display)
1892 */ 1892 */
1893 getopt32(argv, "EMmN~I" IF_FEATURE_LESS_TRUNCATE("S") /*ignored:*/"s"); 1893 getopt32(argv, "EMmN~I"
1894 IF_FEATURE_LESS_TRUNCATE("S")
1895 IF_FEATURE_LESS_RAW("R")
1896 /*ignored:*/"s"
1897 );
1894 argv += optind; 1898 argv += optind;
1895 num_files = argc - optind; 1899 num_files = argc - optind;
1896 files = argv; 1900 files = argv;