Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 17:58:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1511 from sylvestre/more

Browse source 
fix(more) handle no arguments without panic; add test and a FixME
This commit is contained in:
Roy Ivy III 2020-05-15 19:17:01 -05:00 committed by GitHub
commit 8e886c30dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/uu/more/src/more.rs
View file

@ -41,6 +41,12 @@ static VERSION: &str = env!("CARGO_PKG_VERSION");
pub fn uumain(args: Vec<String>) -> i32 {
let mut opts = Options::new();
// FixME: fail without panic for now; but `more` should work with no arguments (ie, for piped input)
if args.len() < 2 {
println!("{}: incorrect usage", args[0]);
return 1;
}
opts.optflag("h", "help", "display this help and exit");
opts.optflag("v", "version", "output version information and exit");

8
tests/test_more.rs Normal file
View file

@ -0,0 +1,8 @@
use common::util::*;
#[test]
fn test_more_no_arg() {
let (_, mut ucmd) = at_and_ucmd!();
let result = ucmd.run();
assert!(!result.success);
}

1
tests/tests.rs
View file

@ -78,6 +78,7 @@ generic! {
"ls", test_ls;
"mkdir", test_mkdir;
"mktemp", test_mktemp;
"more", test_more;
"mv", test_mv;
"numfmt", test_numfmt;
"nl", test_nl;