Merge branch 'main' into fix/issue-11315

baa-ableton · web-flow · commit 86a8a74e41ce · 2026-03-27T17:20:33.000+01:00
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -102,7 +102,7 @@ jobs:
 # for now, don't build it on mac & windows because the doc is only published from linux
 # + it needs a bunch of duplication for build
 # and I don't want to add a doc step in the regular build to avoid long builds
-#          - { os: macos-latest   , features: feat_os_macos }
+#          - { os: macos-latest   , features: feat_os_unix }
 #          - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -277,7 +277,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: feat_os_unix }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -320,7 +320,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: feat_os_unix }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -381,10 +381,10 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-netbsd, features: "feat_os_unix", use-cross: use-cross , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: wasm32-wasip1, default-features: false, features: feat_wasm, skip-tests: true }
-          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
+          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_unix, workspace-tests: true } # M1 CPU
           # PR #7964: chcon should not break build without the feature. cargo check is enough to detect it.
           - { os: macos-latest   , target: aarch64-apple-darwin        , workspace-tests: true, check-only: true } # M1 CPU
-          - { os: macos-latest   , target: x86_64-apple-darwin         , features: feat_os_macos, workspace-tests: true }
+          - { os: macos-latest   , target: x86_64-apple-darwin         , features: feat_os_unix, workspace-tests: true }
           - { os: windows-latest , target: i686-pc-windows-msvc        , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-gnu       , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-msvc      , features: feat_os_windows }
@@ -870,7 +870,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
 
     steps:
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -72,7 +72,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: all             , workspace: true }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
@@ -31,7 +31,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: "feat_os_unix" }
-          - { os: macos-latest   , features: "feat_os_macos" }
+          - { os: macos-latest   , features: "feat_os_unix" }
           - { os: windows-latest , features: "feat_os_windows" }
     steps:
     - uses: actions/checkout@v6
@@ -397,7 +397,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: "feat_os_unix" }
-          - { os: macos-latest   , features: "feat_os_macos" }
+          - { os: macos-latest   , features: "feat_os_unix" }
     steps:
     - uses: actions/checkout@v6
       with:
@@ -550,7 +550,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: "feat_os_unix" }
-          - { os: macos-latest   , features: "feat_os_macos" }
+          - { os: macos-latest   , features: "feat_os_unix" }
     steps:
     - uses: actions/checkout@v6
       with:
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,6 @@ all-features = true
 [features]
 default = ["feat_common_core"]
 ## OS feature shortcodes
-macos = ["feat_os_macos"]
 unix = ["feat_os_unix"]
 windows = ["feat_os_windows"]
 ## project-specific feature shortcodes
@@ -230,10 +229,6 @@ feat_wasm = [
   "arch",
   "uname",
 ]
-# "feat_os_macos" == set of utilities which can be built/run on the MacOS platform
-feat_os_macos = [
-  "feat_os_unix", ## == a modern/usual *nix platform
-]
 # "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms.
 feat_os_unix = [
   "feat_Tier1",
diff --git a/README.md b/README.md
@@ -111,8 +111,6 @@ sets of uutils for a platform (on that platform) is as simple as specifying it
 as a feature:
 
 ```shell
-cargo build --release --features macos
-# or ...
 cargo build --release --features windows
 # or ...
 cargo build --release --features unix
diff --git a/docs/src/installation.md b/docs/src/installation.md
@@ -15,10 +15,8 @@ You can also [build uutils from source](build.md).
 [![crates.io package](https://repology.org/badge/version-for-repo/crates_io/uutils-coreutils.svg)](https://crates.io/crates/coreutils)
 
 ```shell
-# Linux
+# Unix like
 cargo install coreutils --features unix --locked
-# MacOs
-cargo install coreutils --features macos --locked
 # Windows
 cargo install coreutils --features windows --locked
 ```
diff --git a/src/uu/head/src/take.rs b/src/uu/head/src/take.rs
@@ -163,6 +163,7 @@ impl TakeAllLinesBuffer {
         reader: &mut impl Read,
         separator: u8,
     ) -> std::io::Result<BytesAndLines> {
+        self.partial_line = false;
         let bytes_read = self.inner.fill_buffer(reader)?;
         // Count the number of lines...
         self.terminated_lines = memchr_iter(separator, self.inner.remaining_buffer()).count();
diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs
@@ -38,10 +38,8 @@ mod wsa {
     pub(super) struct WsaHandle(());
 
     pub(super) fn start() -> io::Result<WsaHandle> {
-        let err = unsafe {
-            let mut data = std::mem::MaybeUninit::<WSADATA>::uninit();
-            WSAStartup(0x0202, data.as_mut_ptr())
-        };
+        let mut data = std::mem::MaybeUninit::<WSADATA>::uninit();
+        let err = unsafe { WSAStartup(0x0202, data.as_mut_ptr()) };
         if err == 0 {
             Ok(WsaHandle(()))
         } else {
@@ -51,10 +49,8 @@ mod wsa {
 
     impl Drop for WsaHandle {
         fn drop(&mut self) {
-            unsafe {
-                // This possibly returns an error but we can't handle it
-                let _err = WSACleanup();
-            }
+            // This possibly returns an error but we can't handle it
+            let _ = unsafe { WSACleanup() };
         }
     }
 }
diff --git a/src/uu/who/src/platform/unix.rs b/src/uu/who/src/platform/unix.rs
@@ -179,16 +179,14 @@ fn time_string(ut: &UtmpxRecord) -> String {
 
 #[inline]
 fn current_tty() -> String {
-    unsafe {
-        let res = ttyname(STDIN_FILENO);
-        if res.is_null() {
-            String::new()
-        } else {
-            CStr::from_ptr(res.cast_const())
-                .to_string_lossy()
-                .trim_start_matches("/dev/")
-                .to_owned()
-        }
+    let p = unsafe { ttyname(STDIN_FILENO) };
+    if p.is_null() {
+        String::new()
+    } else {
+        unsafe { CStr::from_ptr(p) }
+            .to_string_lossy()
+            .trim_start_matches("/dev/")
+            .to_owned()
     }
 }
 
diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml
@@ -22,12 +22,7 @@ path = "src/yes.rs"
 clap = { workspace = true }
 itertools = { workspace = true }
 fluent = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-uucore = { workspace = true, features = ["pipes", "signals"] }
-
-[target.'cfg(not(unix))'.dependencies]
-uucore = { workspace = true, features = ["pipes"] }
+uucore = { workspace = true }
 
 [[bin]]
 name = "yes"
diff --git a/src/uucore/src/lib/features/checksum/mod.rs b/src/uucore/src/lib/features/checksum/mod.rs
@@ -200,6 +200,22 @@ impl AlgoKind {
         use AlgoKind::*;
         matches!(self, Sysv | Bsd | Crc | Crc32b)
     }
+
+    /// When checking untagged format lines, non-XOF non-legacy algorithms
+    /// should report "improperly formatted lines" if the digest length isn't
+    /// equivalent to this.
+    pub fn expected_digest_bit_len(self) -> Option<usize> {
+        match self {
+            Self::Md5 => Some(Md5::BIT_SIZE),
+            Self::Sm3 => Some(Sm3::BIT_SIZE),
+            Self::Sha1 => Some(Sha1::BIT_SIZE),
+            Self::Sha224 => Some(Sha224::BIT_SIZE),
+            Self::Sha256 => Some(Sha256::BIT_SIZE),
+            Self::Sha384 => Some(Sha384::BIT_SIZE),
+            Self::Sha512 => Some(Sha512::BIT_SIZE),
+            _ => None,
+        }
+    }
 }
 
 /// Holds a length for a SHA2 of SHA3 algorithm kind.
diff --git a/src/uucore/src/lib/features/checksum/validate.rs b/src/uucore/src/lib/features/checksum/validate.rs
@@ -15,7 +15,7 @@ use std::io::{self, BufReader, Read, Write, stderr, stdin};
 use os_display::Quotable;
 
 use crate::checksum::{
-    AlgoKind, BlakeLength, ChecksumError, ReadingMode, SizedAlgoKind, digest_reader,
+    AlgoKind, BlakeLength, ChecksumError, ReadingMode, ShaLength, SizedAlgoKind, digest_reader,
     parse_blake_length, unescape_filename,
 };
 use crate::error::{FromIo, UError, UIoError, UResult, USimpleError};
@@ -490,14 +490,16 @@ impl LineInfo {
 }
 
 /// Extract the expected digest from the checksum string and decode it
-fn get_raw_expected_digest(checksum: &str, byte_len_hint: Option<usize>) -> Option<Vec<u8>> {
+fn get_raw_expected_digest(checksum: &str, bit_len_hint: Option<usize>) -> Option<Vec<u8>> {
     // If the length of the digest is not a multiple of 2, then it must be
     // improperly formatted (1 byte is 2 hex digits, and base64 strings should
     // always be a multiple of 4).
     if !checksum.len().is_multiple_of(2) {
         return None;
     }
 
+    let byte_len_hint = bit_len_hint.map(|n| n.div_ceil(8));
+
     let checks_hint = |len| byte_len_hint.is_none_or(|hint| hint == len);
 
     // If the length of the string matches the one to be expected (in case it's
@@ -741,23 +743,23 @@ fn process_algo_based_line(
 ) -> Result<(), LineCheckError> {
     let filename_to_check = line_info.filename.as_slice();
 
-    let (algo_kind, algo_byte_len) =
-        identify_algo_name_and_length(line_info, cli_algo_kind, last_algo)?;
+    let (algo_kind, algo_len) = identify_algo_name_and_length(line_info, cli_algo_kind, last_algo)?;
 
     // If the digest bitlen is known, we can check the format of the expected
     // checksum with it.
-    let digest_char_length_hint = match (algo_kind, algo_byte_len) {
-        (AlgoKind::Blake2b | AlgoKind::Blake3, Some(byte_len)) => Some(byte_len),
-        (AlgoKind::Shake128 | AlgoKind::Shake256, Some(bit_len)) => Some(bit_len.div_ceil(8)),
-        (AlgoKind::Shake128, None) => Some(sum::Shake128::DEFAULT_BIT_SIZE.div_ceil(8)),
-        (AlgoKind::Shake256, None) => Some(sum::Shake256::DEFAULT_BIT_SIZE.div_ceil(8)),
+    let digest_bit_length_hint = match (algo_kind, algo_len) {
+        (AlgoKind::Blake2b | AlgoKind::Blake3, Some(byte_len)) => Some(byte_len * 8),
+        (AlgoKind::Shake128 | AlgoKind::Shake256, Some(bit_len)) => Some(bit_len),
+        (AlgoKind::Shake128, None) => Some(sum::Shake128::DEFAULT_BIT_SIZE),
+        (AlgoKind::Shake256, None) => Some(sum::Shake256::DEFAULT_BIT_SIZE),
         _ => None,
     };
 
-    let expected_checksum = get_raw_expected_digest(&line_info.checksum, digest_char_length_hint)
+    let expected_checksum = get_raw_expected_digest(&line_info.checksum, digest_bit_length_hint)
         .ok_or(LineCheckError::ImproperlyFormatted)?;
 
-    let algo = SizedAlgoKind::from_unsized(algo_kind, algo_byte_len)?;
+    let algo = SizedAlgoKind::from_unsized(algo_kind, algo_len)
+        .map_err(|_| LineCheckError::ImproperlyFormatted)?;
 
     compute_and_check_digest_from_file(filename_to_check, &expected_checksum, algo, opts)
 }
@@ -779,7 +781,9 @@ fn process_non_algo_based_line(
         // Remove the leading asterisk if present - only for the first line
         filename_to_check = &filename_to_check[1..];
     }
-    let expected_checksum = get_raw_expected_digest(&line_info.checksum, None)
+
+    let expected_digest_sum = cli_algo_kind.expected_digest_bit_len();
+    let expected_checksum = get_raw_expected_digest(&line_info.checksum, expected_digest_sum)
         .ok_or(LineCheckError::ImproperlyFormatted)?;
 
     // When a specific algorithm name is input, use it and use the provided
@@ -789,7 +793,11 @@ fn process_non_algo_based_line(
         ak::Blake2b | ak::Blake3 => Some(expected_checksum.len()),
         ak::Sha2 | ak::Sha3 => {
             // multiplication by 8 to get the number of bits
-            Some(expected_checksum.len() * 8)
+            Some(
+                ShaLength::try_from(expected_checksum.len() * 8)
+                    .map_err(|_| LineCheckError::ImproperlyFormatted)?
+                    .as_usize(),
+            )
         }
         _ => cli_algo_length,
     };
diff --git a/src/uucore/src/lib/features/sum.rs b/src/uucore/src/lib/features/sum.rs
@@ -176,6 +176,10 @@ impl Digest for Blake3 {
 #[derive(Default)]
 pub struct Sm3(sm3::Sm3);
 
+impl Sm3 {
+    pub const BIT_SIZE: usize = 256;
+}
+
 impl Digest for Sm3 {
     fn hash_update(&mut self, input: &[u8]) {
         <sm3::Sm3 as sm3::Digest>::update(&mut self.0, input);
@@ -190,7 +194,7 @@ impl Digest for Sm3 {
     }
 
     fn output_bits(&self) -> usize {
-        256
+        Self::BIT_SIZE
     }
 }
 
@@ -367,6 +371,9 @@ impl Digest for SysV {
 // Implements the Digest trait for sha2 / sha3 algorithms with fixed output
 macro_rules! impl_digest_common {
     ($algo_type: ty, $size: literal) => {
+        impl $algo_type {
+            pub const BIT_SIZE: usize = $size;
+        }
         impl Default for $algo_type {
             fn default() -> Self {
                 Self(Default::default())
@@ -386,7 +393,7 @@ macro_rules! impl_digest_common {
             }
 
             fn output_bits(&self) -> usize {
-                $size
+                Self::BIT_SIZE
             }
         }
     };
diff --git a/tests/by-util/test_chown.rs b/tests/by-util/test_chown.rs
@@ -494,7 +494,7 @@ fn test_chown_only_group_id() {
     }
     result.stderr_contains("retained as");
 
-    // Apparently on CI "macos-latest, x86_64-apple-darwin, feat_os_macos"
+    // Apparently on CI "macos-latest, x86_64-apple-darwin, feat_os_unix"
     // the process has the rights to change from runner:staff to runner:wheel
     #[cfg(any(windows, all(unix, not(target_os = "macos"))))]
     // FreeBSD user on CI is part of wheel group
diff --git a/tests/by-util/test_cksum.rs b/tests/by-util/test_cksum.rs
diff --git a/tests/by-util/test_head.rs b/tests/by-util/test_head.rs
