checksum: rework for improving checkum checking GNU behavior match

src/uu/cksum/src/cksum.rs

@@ -11,8 +11,9 @@ use std::fs::File;
 use std::io::{self, stdin, stdout, BufReader, Read, Write};
 use std::iter;
 use std::path::Path;
+use uucore::checksum::ChecksumOptions;
 use uucore::checksum::{
-    calculate_blake2b_length, detect_algo, digest_reader, perform_checksum_validation,
+    algo::detect_algo, calculate_blake2b_length, digest_reader, perform_checksum_validation,
     ChecksumError, ALGORITHM_OPTIONS_BLAKE2B, ALGORITHM_OPTIONS_BSD, ALGORITHM_OPTIONS_CRC,
     ALGORITHM_OPTIONS_SYSV, SUPPORTED_ALGORITHMS,
 };
@@ -262,14 +263,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let algo_name: &str = match matches.get_one::<String>(options::ALGORITHM) {
         Some(v) => v,
-        None => {
-            if check {
-                // if we are doing a --check, we should not default to crc
-                ""
-            } else {
-                ALGORITHM_OPTIONS_CRC
-            }
-        }
+        // if we are doing a --check, we should not default to crc
+        None if check => "",
+        None => ALGORITHM_OPTIONS_CRC,
     };
 
     if ["bsd", "crc", "sysv"].contains(&algo_name) && check {
@@ -314,17 +310,17 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             || iter::once(OsStr::new("-")).collect::<Vec<_>>(),
             |files| files.map(OsStr::new).collect::<Vec<_>>(),
         );
-        return perform_checksum_validation(
-            files.iter().copied(),
-            strict,
-            status,
-            warn,
-            binary_flag,
+
+        let opts = ChecksumOptions {
+            binary: binary_flag,
             ignore_missing,
             quiet,
-            algo_option,
-            length,
-        );
+            status,
+            strict,
+            warn,
+        };
+
+        return perform_checksum_validation(files.iter().copied(), opts, algo_option, length);
     }
 
     let (tag, asterisk) = handle_tag_text_binary_flags(&matches)?;

src/uu/hashsum/src/hashsum.rs

@@ -16,16 +16,17 @@ use std::io::{stdin, BufReader, Read};
 use std::iter;
 use std::num::ParseIntError;
 use std::path::Path;
-use uucore::checksum::calculate_blake2b_length;
-use uucore::checksum::create_sha3;
-use uucore::checksum::detect_algo;
-use uucore::checksum::digest_reader;
-use uucore::checksum::escape_filename;
-use uucore::checksum::perform_checksum_validation;
-use uucore::checksum::ChecksumError;
-use uucore::checksum::HashAlgorithm;
-use uucore::error::{FromIo, UResult};
+use uucore::checksum::ChecksumOptions;
+use uucore::checksum::{
+    algo::{create_sha3, detect_algo},
+    calculate_blake2b_length, digest_reader, escape_filename, perform_checksum_validation,
+    ChecksumError,
+};
 use uucore::sum::{Digest, Sha3_224, Sha3_256, Sha3_384, Sha3_512, Shake128, Shake256};
+use uucore::{
+    checksum::HashAlgorithm,
+    error::{FromIo, UResult},
+};
 use uucore::{format_usage, help_about, help_usage};
 
 const NAME: &str = "hashsum";
@@ -233,15 +234,19 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
             |files| files.map(OsStr::new).collect::<Vec<_>>(),
         );
 
+        let opts = ChecksumOptions {
+            binary: binary_flag,
+            ignore_missing,
+            quiet,
+            status,
+            strict,
+            warn,
+        };
+
         // Execute the checksum validation
         return perform_checksum_validation(
             input.iter().copied(),
-            strict,
-            status,
-            warn,
-            binary_flag,
-            ignore_missing,
-            quiet,
+            opts,
             Some(algo.name),
             Some(algo.bits),
         );