Merge pull request #5804 from Ato2207/cksum_error

cakebaker · web-flow · commit 8e83b347c6bd · 2024-01-08T08:38:48.000+01:00
Made cksum return an error if the algorithm blake2b is used on a directory.
diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs
@@ -169,6 +169,13 @@ where
             (ALGORITHM_OPTIONS_CRC, true) => println!("{sum} {sz}"),
             (ALGORITHM_OPTIONS_CRC, false) => println!("{sum} {sz} {}", filename.display()),
             (ALGORITHM_OPTIONS_BLAKE2B, _) if !options.untagged => {
+                if filename.is_dir() {
+                    return Err(io::Error::new(
+                        io::ErrorKind::InvalidInput,
+                        format!("{}: Is a directory", filename.display()),
+                    )
+                    .into());
+                }
                 if let Some(length) = options.length {
                     // Multiply by 8 here, as we want to print the length in bits.
                     println!("BLAKE2b-{} ({}) = {sum}", length * 8, filename.display());
diff --git a/tests/by-util/test_cksum.rs b/tests/by-util/test_cksum.rs
@@ -286,3 +286,17 @@ fn test_length_is_zero() {
         .no_stderr()
         .stdout_is_fixture("length_is_zero.expected");
 }
+
+#[test]
+fn test_blake2b_fail_on_directory() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    let folder_name = "a_folder";
+    at.mkdir(folder_name);
+
+    ucmd.arg("--algorithm=blake2b")
+        .arg(folder_name)
+        .fails()
+        .no_stdout()
+        .stderr_contains(format!("cksum: {folder_name}: Is a directory"));
+}
