From 41f3714e25615044834f7563d22549f3950fe829 Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Wed, 18 Mar 2026 14:45:41 +0900 Subject: [PATCH] numfmt: protect name from argv[0], perf +3% --- src/uu/numfmt/src/numfmt.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs index f71e96bfb66..b5c951b5884 100644 --- a/src/uu/numfmt/src/numfmt.rs +++ b/src/uu/numfmt/src/numfmt.rs @@ -23,7 +23,7 @@ use uucore::error::UResult; use uucore::parser::shortcut_value_parser::ShortcutValueParser; use uucore::ranges::Range; -use uucore::{format_usage, os_str_as_bytes, show, translate, util_name}; +use uucore::{format_usage, os_str_as_bytes, show, translate}; pub mod errors; pub mod format; @@ -112,7 +112,7 @@ fn write_line( show!(NumfmtError::FormattingError(error_message)); } InvalidModes::Warn => { - let _ = writeln!(stderr(), "{}: {error_message}", util_name()); + let _ = writeln!(stderr(), "numfmt: {error_message}"); } InvalidModes::Ignore => {} } @@ -326,8 +326,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) { { let _ = writeln!( stderr(), - "{}: {}", - util_name(), + "numfmt: {}", translate!("numfmt-debug-no-conversion") ); } @@ -336,8 +335,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) { if options.header > 0 && matches.get_many::(NUMBER).is_some() { let _ = writeln!( stderr(), - "{}: {}", - util_name(), + "numfmt: {}", translate!("numfmt-debug-header-ignored") ); } @@ -375,9 +373,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(util_name()) + Command::new("numfmt") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(util_name())) + .help_template(uucore::localized_help_template("numfmt")) .about(translate!("numfmt-about")) .after_help(translate!("numfmt-after-help")) .override_usage(format_usage(&translate!("numfmt-usage")))