Skip to content

sort: keep numeric-looking file names verbatim in errors #15565

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
Oct 22, 2026
Merged

sort: keep numeric-looking file names verbatim in errors #15565

Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions src/uu/sort/src/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,19 @@ pub enum SortError {
silent: bool,
},

#[error("{}", translate!("sort-open-failed", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
#[error("{}", translate_text!("sort-open-failed", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
OpenFailed {
path: PathBuf,
error: std::io::Error,
},

#[error("{}", translate!("sort-truncate-failed", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
#[error("{}", translate_text!("sort-truncate-failed", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
TruncateFailed {
path: PathBuf,
error: std::io::Error,
},

#[error("{}", translate!("sort-cannot-read", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
#[error("{}", translate_text!("sort-cannot-read", "path" => format!("{}", .path.maybe_quote()), "error" => strip_errno(.error)))]
ReadFailed {
path: PathBuf,
error: std::io::Error,
Expand All @@ -170,10 +170,10 @@ pub enum SortError {
#[error("{}", translate!("sort-compress-prog-terminated-abnormally", "prog" => .prog.quote()))]
CompressProgTerminatedAbnormally { prog: String },

#[error("{}", translate!("sort-cannot-create-tmp-file", "path" => format!("{}", .path.quote())))]
#[error("{}", translate_text!("sort-cannot-create-tmp-file", "path" => format!("{}", .path.quote())))]
TmpFileCreationFailed { path: PathBuf },

#[error("{}", translate!("sort-file-operands-combined", "file" => format!("{}", .file.quote()), "help" => uucore::execution_phrase()))]
#[error("{}", translate_text!("sort-file-operands-combined", "file" => format!("{}", .file.quote()), "help" => uucore::execution_phrase()))]
FileOperandsCombined { file: PathBuf },

#[error("{error}")]
Expand All @@ -185,13 +185,13 @@ pub enum SortError {
#[error("{}", translate!("sort-minus-in-stdin"))]
MinusInStdIn,

#[error("{}", translate!("sort-no-input-from", "file" => format!("{}", .file.quote())))]
#[error("{}", translate_text!("sort-no-input-from", "file" => format!("{}", .file.quote())))]
EmptyInputFile { file: PathBuf },

#[error("{}", translate!("sort-random-source-end-of-file", "path" => format!("{}", .path.quote())))]
#[error("{}", translate_text!("sort-random-source-end-of-file", "path" => format!("{}", .path.quote())))]
RandomSourceEndOfFile { path: PathBuf },

#[error("{}", translate!("sort-invalid-zero-length-filename", "file" => .file.maybe_quote(), "line_num" => .line_num))]
#[error("{}", translate_text!("sort-invalid-zero-length-filename", "file" => .file.maybe_quote(), "line_num" => .line_num))]
ZeroLengthFileName { file: PathBuf, line_num: usize },
}

Expand Down Expand Up @@ -289,7 +289,7 @@ impl Output {
.as_output_name()
.unwrap_or(OsStr::new("standard output"))
.to_owned();
move || translate!("sort-error-write-failed", "output" => output_name.maybe_quote())
move || translate_text!("sort-error-write-failed", "output" => output_name.maybe_quote())
}
}

Expand Down Expand Up @@ -2416,7 +2416,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
} else if settings.check && files.len() != 1 {
return Err(UUsageError::new(
2,
translate!("sort-extra-operand-not-allowed-with-c", "operand" => files[1].quote()),
translate_text!("sort-extra-operand-not-allowed-with-c", "operand" => files[1].quote()),
));
}

Expand Down
17 changes: 17 additions & 0 deletions tests/by-util/test_sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3942,3 +3942,20 @@ fn test_control_whitespace(#[case] args: &[&str], #[case] input: &str, #[case] e
.succeeds()
.stdout_only(expected);
}

#[rstest::rstest]
#[case(&["1e3"], "sort: cannot read: 1e3: No such file or directory\n")]
#[case(&["-o", "007", "empty"], "sort: open failed: 007: Is a directory\n")]
#[case(&["--files0-from=2.50"], "sort: open failed: 2.50: No such file or directory\n")]
#[cfg(not(windows))]
fn test_numeric_looking_file_names_are_kept_verbatim(
#[case] args: &[&str],
#[case] expected: &str,
) {
// File names such as "007" or "1e3" must not be reformatted as numbers
// in error messages.
let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("007");
at.touch("empty");
ucmd.args(args).fails_with_code(2).stderr_is(expected);
}
Loading