Skip to content

Commit 7609966

Browse files
oech3cakebaker
authored andcommitted
numfmt: protect name from argv[0], perf +3%
1 parent 91070e6 commit 7609966

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

src/uu/numfmt/src/numfmt.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use uucore::error::UResult;
2323

2424
use uucore::parser::shortcut_value_parser::ShortcutValueParser;
2525
use uucore::ranges::Range;
26-
use uucore::{format_usage, os_str_as_bytes, show, translate, util_name};
26+
use uucore::{format_usage, os_str_as_bytes, show, translate};
2727

2828
pub mod errors;
2929
pub mod format;
@@ -112,7 +112,7 @@ fn write_line<W: std::io::Write>(
112112
show!(NumfmtError::FormattingError(error_message));
113113
}
114114
InvalidModes::Warn => {
115-
let _ = writeln!(stderr(), "{}: {error_message}", util_name());
115+
let _ = writeln!(stderr(), "numfmt: {error_message}");
116116
}
117117
InvalidModes::Ignore => {}
118118
}
@@ -326,8 +326,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) {
326326
{
327327
let _ = writeln!(
328328
stderr(),
329-
"{}: {}",
330-
util_name(),
329+
"numfmt: {}",
331330
translate!("numfmt-debug-no-conversion")
332331
);
333332
}
@@ -336,8 +335,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) {
336335
if options.header > 0 && matches.get_many::<OsString>(NUMBER).is_some() {
337336
let _ = writeln!(
338337
stderr(),
339-
"{}: {}",
340-
util_name(),
338+
"numfmt: {}",
341339
translate!("numfmt-debug-header-ignored")
342340
);
343341
}
@@ -375,9 +373,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
375373
}
376374

377375
pub fn uu_app() -> Command {
378-
Command::new(util_name())
376+
Command::new("numfmt")
379377
.version(uucore::crate_version!())
380-
.help_template(uucore::localized_help_template(util_name()))
378+
.help_template(uucore::localized_help_template("numfmt"))
381379
.about(translate!("numfmt-about"))
382380
.after_help(translate!("numfmt-after-help"))
383381
.override_usage(format_usage(&translate!("numfmt-usage")))

0 commit comments

Comments
 (0)