mktemp: adjust the error message to match 9.5

uutils · Mar 29, 2024 · 1931c10 · 1931c10
1 parent 8ae8de0
commit 1931c10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs
@@ -236,8 +236,13 @@ impl Params {
         let (i, j) = match find_last_contiguous_block_of_xs(&options.template) {
             None => {
                 let s = match options.suffix {
-                    None => options.template,
-                    Some(s) => format!("{}{}", options.template, s),
+                    // 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.clone(),
                 };
                 return Err(MkTempError::TooFewXs(s));
             }

diff --git a/tests/by-util/test_mktemp.rs b/tests/by-util/test_mktemp.rs
@@ -629,15 +629,15 @@ fn test_too_few_xs_suffix() {
     new_ucmd!()
         .args(&["--suffix=X", "aXX"])
         .fails()
-        .stderr_only("mktemp: too few X's in template 'aXXX'\n");
+        .stderr_only("mktemp: too few X's in template 'aXX'\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");
+        .stderr_only("mktemp: too few X's in template 'aXX'\n");
 }
 
 #[test]