More implement arguments plain and from line #4950
Conversation
src/uu/more/src/more.rs
Outdated
| ) -> UResult<()> { | ||
| let (cols, mut rows) = terminal::size().unwrap(); | ||
| if let Some(number) = options.lines { | ||
| rows = number; | ||
| } | ||
|
|
||
| let lines = break_buff(buff, usize::from(cols)); | ||
| let mut lines = break_buff(buff, usize::from(cols)); |
There was a problem hiding this comment.
according to the coverage, the test doesn't go here, would it be possible to test that? thanks
There was a problem hiding this comment.
I have added a test for it, but I believe the coverage still doesn't detect it because the tests for more are all contained within an if std::io::stdout().is_terminal() statement.
|
Hm, strange, my local |
Yes, you are right. The problem is that clap doesn't currently work with non-Unix options. There's an open issue about this problem at clap-rs/clap#2468 That's why I use what was given in #2320 (comment) |
|
I think using "normal" arguments is fine, because |
|
I think there is a bug with paging up. When I run |
Ideflop
force-pushed
the
more_implement_arguments_plain_and_from_line
branch
from
b0d8192 to
b6f53aa
Compare
Ideflop
force-pushed
the
more_implement_arguments_plain_and_from_line
branch
from
b6f53aa to
c4c3a35
Compare
Yes, this is a bug. It should now be resolved. |
|
Thanks! |
Related to #2320
This implements the arguments
plainandfrom-line.The
plainoption does nothing because, according to the man page ofmore, it is written that this option is silently ignored as backwards compatibility.This also fixes two bugs.
The first one occurs when multiple files are given, and a file takes one display to output its content. Now, it displays the next file message if there is another file and only stops if there is none other.
The second one happens with the
squeezeoption. When multiple files are given and the end of the file takes less than a full terminal size to display, it should not start printing the next file.