Skip to content

coreutils: Print usage to stderr. #7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fnordahl wants to merge 4 commits into
base: main
Choose a base branch
from
Open

coreutils: Print usage to stderr. #7920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f2b944
coreutils: Print usage to stderr.
fnordahl May 9, 2025
c0fb43c
Merge branch 'main' into coreutils-usage-on-stderr
sylvestre Nov 15, 2025
43eacd9
Merge branch 'main' into coreutils-usage-on-stderr
sylvestre Dec 26, 2025
9646b36
Merge branch 'main' into coreutils-usage-on-stderr
sylvestre Dec 29, 2025
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
22 changes: 11 additions & 11 deletions src/bin/coreutils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ const VERSION: &str = env!("CARGO_PKG_VERSION");
include!(concat!(env!("OUT_DIR"), "/uutils_map.rs"));

fn usage<T>(utils: &UtilityMap<T>, name: &str) {
println!("{name} {VERSION} (multi-call binary)\n");
println!("Usage: {name} [function [arguments...]]");
println!(" {name} --list");
println!();
eprintln!("{name} {VERSION} (multi-call binary)\n");
eprintln!("Usage: {name} [function [arguments...]]");
eprintln!(" {name} --list");
eprintln!();
#[cfg(feature = "feat_common_core")]
{
println!("Functions:");
println!(" '<uutils>' [arguments...]");
println!();
eprintln!("Functions:");
eprintln!(" '<uutils>' [arguments...]");
eprintln!();
}
println!("Options:");
println!(" --list lists all defined functions, one per row\n");
println!("Currently defined functions:\n");
eprintln!("Options:");
eprintln!(" --list lists all defined functions, one per row\n");
eprintln!("Currently defined functions:\n");
#[allow(clippy::map_clone)]
let mut utils: Vec<&str> = utils.keys().map(|&s| s).collect();
utils.sort_unstable();
let display_list = utils.join(", ");
let width = cmp::min(textwrap::termwidth(), 100) - 4 * 2; // (opinion/heuristic) max 100 chars wide with 4 character side indentions
println!(
eprintln!(
"{}",
textwrap::indent(&textwrap::fill(&display_list, width), " ")
);
Expand Down
8 changes: 4 additions & 4 deletions tests/test_util_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ fn util_invalid_name_help() {
.unwrap();
let output = child.wait_with_output().unwrap();
assert_eq!(output.status.code(), Some(0));
assert_eq!(output.stderr, b"");
let output_str = String::from_utf8(output.stdout).unwrap();
assert_eq!(output.stdout, b"");
let output_str = String::from_utf8(output.stderr).unwrap();
assert!(output_str.contains("(multi-call binary)"), "{output_str:?}");
assert!(
output_str.contains("Usage: invalid_name [function "),
Expand Down Expand Up @@ -165,8 +165,8 @@ fn util_non_utf8_name_help() {
.unwrap();
let output = child.wait_with_output().unwrap();
assert_eq!(output.status.code(), Some(0));
assert_eq!(output.stderr, b"");
let output_str = String::from_utf8(output.stdout).unwrap();
assert_eq!(output.stdout, b"");
let output_str = String::from_utf8(output.stderr).unwrap();
assert!(output_str.contains("(multi-call binary)"), "{output_str:?}");
assert!(
output_str.contains("Usage: <unknown binary name> [function "),
Expand Down
Loading