shred: correctly print zero-byte pass in verbose mode (#7800)

BenWiederhake · sylvestre · web-flow · commit d7d0f9da7a82 · 2025-04-21T11:06:06.000+02:00
Fixes #7798. Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>
diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs
@@ -376,8 +376,8 @@ fn get_size(size_str_opt: Option<String>) -> Option<u64> {
 fn pass_name(pass_type: &PassType) -> String {
     match pass_type {
         PassType::Random => String::from("random"),
-        PassType::Pattern(Pattern::Single(byte)) => format!("{byte:x}{byte:x}{byte:x}"),
-        PassType::Pattern(Pattern::Multi([a, b, c])) => format!("{a:x}{b:x}{c:x}"),
+        PassType::Pattern(Pattern::Single(byte)) => format!("{byte:02x}{byte:02x}{byte:02x}"),
+        PassType::Pattern(Pattern::Multi([a, b, c])) => format!("{a:02x}{b:02x}{c:02x}"),
     }
 }
 
diff --git a/tests/by-util/test_shred.rs b/tests/by-util/test_shred.rs
@@ -209,6 +209,17 @@ fn test_shred_fail_no_perm() {
         .stderr_contains("Couldn't rename to");
 }
 
+#[test]
+fn test_shred_verbose_pass_single_0_byte_name() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let file = "foo";
+    at.write(file, "non-empty");
+    ucmd.arg("-vn200")
+        .arg(file)
+        .succeeds()
+        .stderr_contains("/200 (000000)...\n");
+}
+
 #[test]
 fn test_shred_verbose_no_padding_1() {
     let (at, mut ucmd) = at_and_ucmd!();

Original file line number	Diff line number	Diff line change
`@@ -376,8 +376,8 @@ fn get_size(size_str_opt: Option<String>) -> Option<u64> {`
`376`	`376`	`fn pass_name(pass_type: &PassType) -> String {`
`377`	`377`	`match pass_type {`
`378`	`378`	`PassType::Random => String::from("random"),`
`379`		`- PassType::Pattern(Pattern::Single(byte)) => format!("{byte:x}{byte:x}{byte:x}"),`
`380`		`- PassType::Pattern(Pattern::Multi([a, b, c])) => format!("{a:x}{b:x}{c:x}"),`
	`379`	`+ PassType::Pattern(Pattern::Single(byte)) => format!("{byte:02x}{byte:02x}{byte:02x}"),`
	`380`	`+ PassType::Pattern(Pattern::Multi([a, b, c])) => format!("{a:02x}{b:02x}{c:02x}"),`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`