Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/bin/coreutils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,8 @@ fn main() {
process::exit(uumain(vec![util_os].into_iter().chain(args)));
}
None => {
// GNU coreutils --help string shows help for coreutils
if util == "--help" || util == "-h" {
// see if they want help on a specific util
if let Some(util_os) = args.next() {
let Some(util) = util_os.to_str() else {
validation::not_found(&util_os)
};

match utils.get(util) {
Some(&(uumain, _)) => {
let code = uumain(
vec![util_os, OsString::from("--help")]
.into_iter()
.chain(args),
);
io::stdout().flush().expect("could not flush stdout");
process::exit(code);
}
None => validation::not_found(&util_os),
}
}
usage(&utils, binary_as_util);
process::exit(0);
} else if util.starts_with('-') {
Expand Down
12 changes: 12 additions & 0 deletions tests/test_util_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@ fn binary_name_protection() {
.stdout_contains("coreutils");
}

#[test]
fn test_coreutils_help_ignore_args() {
let scenario = TestScenario::new("help_ignoring_args");
let output = std::process::Command::new(&scenario.bin_path)
.arg("--help")
.arg("---")
.output()
.unwrap();

assert_eq!(output.status.code(), Some(0));
}

#[test]
#[cfg(feature = "ls")]
fn execution_phrase_double() {
Expand Down
Loading