system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-07-21 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3551 from jfinkels/mktemp-too-few-xs-suffix

Browse source 
mktemp: include suffix in error message
This commit is contained in:
Sylvestre Ledru 2022-05-23 08:38:15 +02:00 committed by GitHub
parent eae07adfb1 35fb4e6ea1
commit c818ca0039
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,7 +267,11 @@ fn parse_template<'a>(
let rand = right - left;
if rand < 3 {
return Err(MkTempError::TooFewXs(temp.into()));
let s = match suffix {
None => temp.into(),
Some(s) => format!("{}{}", temp, s),
};
return Err(MkTempError::TooFewXs(s));
}
let mut suf = &temp[right..];

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

@ -527,3 +527,19 @@ fn test_suffix_path_separator() {
.fails()
.stderr_only("mktemp: invalid suffix '\\b', contains directory separator\n");
}
#[test]
fn test_too_few_xs_suffix() {
new_ucmd!()
.args(&["--suffix=X", "aXX"])
.fails()
.stderr_only("mktemp: too few X's in template 'aXXX'\n");
}
#[test]
fn test_too_few_xs_suffix_directory() {
new_ucmd!()
.args(&["-d", "--suffix=X", "aXX"])
.fails()
.stderr_only("mktemp: too few X's in template 'aXXX'\n");
}