Skip to content

numfmt: protect name from argv[0], perf +3% #11379

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

Merged
cakebaker merged 1 commit into from
Mar 18, 2026
Merged

numfmt: protect name from argv[0], perf +3% #11379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions src/uu/numfmt/src/numfmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -112,7 +112,7 @@ fn write_line<W: std::io::Write>(
show!(NumfmtError::FormattingError(error_message));
}
InvalidModes::Warn => {
let _ = writeln!(stderr(), "{}: {error_message}", util_name());
let _ = writeln!(stderr(), "numfmt: {error_message}");
}
InvalidModes::Ignore => {}
}
Expand Down Expand Up @@ -326,8 +326,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) {
{
let _ = writeln!(
stderr(),
"{}: {}",
util_name(),
"numfmt: {}",
translate!("numfmt-debug-no-conversion")
);
}
Expand All @@ -336,8 +335,7 @@ fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) {
if options.header > 0 && matches.get_many::<OsString>(NUMBER).is_some() {
let _ = writeln!(
stderr(),
"{}: {}",
util_name(),
"numfmt: {}",
translate!("numfmt-debug-header-ignored")
);
}
Expand Down Expand Up @@ -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")))
Expand Down
Loading