RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #6146 from sylvestre/mktemp

Browse source 
mktemp: adjust the error message to match 9.5
This commit is contained in:
Daniel Hofstetter 2024-03-30 08:12:15 +01:00 • committed by GitHub
commit 28f7d56f6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/uu/mktemp/src/mktemp.rs
View file

@ -236,8 +236,13 @@ impl Params {
let (i, j) = match find_last_contiguous_block_of_xs(&options.template) { let (i, j) = match find_last_contiguous_block_of_xs(&options.template) {
None => { None => {
let s = match options.suffix { let s = match options.suffix {
// If a suffix is specified, the error message includes the template without the suffix.
Some(_) => options
.template
.chars()
.take(options.template.len())
.collect::<String>(),
None => options.template, None => options.template,
Some(s) => format!("{}{}", options.template, s),
}; };
return Err(MkTempError::TooFewXs(s)); return Err(MkTempError::TooFewXs(s));
} }

4
tests/by-util/test_mktemp.rs
View file

@ -629,7 +629,7 @@ fn test_too_few_xs_suffix() {
new_ucmd!() new_ucmd!()
.args(&["--suffix=X", "aXX"]) .args(&["--suffix=X", "aXX"])
.fails() .fails()
.stderr_only("mktemp: too few X's in template 'aXXX'\n"); .stderr_only("mktemp: too few X's in template 'aXX'\n");
} }
#[test] #[test]
@ -637,7 +637,7 @@ fn test_too_few_xs_suffix_directory() {
new_ucmd!() new_ucmd!()
.args(&["-d", "--suffix=X", "aXX"]) .args(&["-d", "--suffix=X", "aXX"])
.fails() .fails()
.stderr_only("mktemp: too few X's in template 'aXXX'\n"); .stderr_only("mktemp: too few X's in template 'aXX'\n");
} }
#[test] #[test]