From 9c52ca8d55deacb07d4922664aa104283a4ba8dc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 15 May 2024 11:46:58 +0200 Subject: [PATCH] cksum: also handle the case when the line start with ' \' --- src/uu/cksum/src/cksum.rs | 2 +- tests/by-util/test_cksum.rs | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index 8645f2d4e..6e244d375 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -422,7 +422,7 @@ where // 1. [-] () = // algo must be uppercase or b (for blake2b) // 2. [* ] - let regex_pattern = r"^(?P[A-Z0-9b]+)(-(?P\d+))?\s?\((?P.*)\) = (?P[a-fA-F0-9]+)$|^(?P[a-fA-F0-9]+)\s[* ](?P.*)"; + let regex_pattern = r"^\s*\\?(?P[A-Z0-9b]+)(-(?P\d+))?\s?\((?P.*)\) = (?P[a-fA-F0-9]+)$|^(?P[a-fA-F0-9]+)\s[* ](?P.*)"; let re = Regex::new(regex_pattern).unwrap(); // if cksum has several input files, it will print the result for each file diff --git a/tests/by-util/test_cksum.rs b/tests/by-util/test_cksum.rs index bdb044899..9072aff86 100644 --- a/tests/by-util/test_cksum.rs +++ b/tests/by-util/test_cksum.rs @@ -809,6 +809,25 @@ fn test_cksum_check_space() { .stderr_contains("line is improperly formatted"); } +#[test] +fn test_cksum_check_leading_info() { + let scene = TestScenario::new(util_name!()); + let at = &scene.fixtures; + + at.touch("f"); + at.write("CHECKSUM", "\ + \\SHA384 (f) = 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b\n\ + \\BLAKE2b (f) = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce\n\ + \\BLAKE2b-384 (f) = b32811423377f52d7862286ee1a72ee540524380fda1724a6f25d7978c6fd3244a6caf0498812673c5e05ef583825100\n\ + \\SM3 (f) = 1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b\n"); + scene + .ucmd() + .arg("--check") + .arg("CHECKSUM") + .succeeds() + .stdout_contains("f: OK\nf: OK\nf: OK\nf: OK\n"); +} + #[test] fn test_cksum_check() { let scene = TestScenario::new(util_name!());