Merge branch 'main' into locales-n

Author: oech3

.github/workflows/CICD.yml

@@ -290,6 +290,7 @@ jobs:
           mv -T target target.cache
         fi
         # Check that we don't cross-build uudoc
+        # also do not try to generate manpages for part of hashsum
         make install-manpages PREFIX=/tmp/usr UTILS=true RUSTC_ARCH="--target aarch64-unknown-linux-gnu"
         # build (host)
         make build

GNUmakefile

@@ -230,6 +230,9 @@ ifneq ($(OS),Windows_NT)
 endif
 
 UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
+ifneq ($(filter hashsum,$(UTILS)),hashsum)
+	HASHSUM_PROGS :=
+endif
 
 ifneq ($(findstring stdbuf,$(UTILS)),)
     # Use external libstdbuf per default. It is more robust than embedding libstdbuf.

src/uu/cksum/src/cksum.rs

@@ -383,14 +383,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let input_length = matches.get_one::<usize>(options::LENGTH);
 
     let length = match input_length {
-        Some(length) => {
-            if algo_name == ALGORITHM_OPTIONS_BLAKE2B {
-                calculate_blake2b_length(*length)?
-            } else {
-                return Err(ChecksumError::LengthOnlyForBlake2b.into());
-            }
+        None | Some(0) => None,
+        Some(length) if algo_name == ALGORITHM_OPTIONS_BLAKE2B => {
+            calculate_blake2b_length(*length)?
+        }
+        _ => {
+            return Err(ChecksumError::LengthOnlyForBlake2b.into());
         }
-        None => None,
     };
 
     if LEGACY_ALGORITHMS.contains(&algo_name) && check {

tests/by-util/test_cksum.rs

@@ -348,6 +348,20 @@ fn test_length_with_wrong_algorithm() {
         .stderr_contains("cksum: --length is only supported with --algorithm=blake2b");
 }
 
+/// Giving --length to a wrong algorithm doesn't fail if the length is zero
+#[test]
+fn test_length_is_zero_with_wrong_algorithm() {
+    for algo in ["md5", "crc", "sha1", "sha224", "sha256", "sha384", "sha512"] {
+        new_ucmd!()
+            .arg("--length=0")
+            .args(&["-a", algo])
+            .arg("lorem_ipsum.txt")
+            .succeeds()
+            .no_stderr()
+            .stdout_is_fixture(format!("{algo}_single_file.expected"));
+    }
+}
+
 #[test]
 fn test_length_not_supported() {
     new_ucmd!()