Merge branch 'main' into misc-coreutils

Author: oech3

.github/workflows/freebsd.yml

@@ -43,7 +43,7 @@ jobs:
       with:
         disable_annotations: true
     - name: Prepare, build and test
-      uses: vmactions/[email protected].8
+      uses: vmactions/[email protected].9
       with:
         usesh: true
         sync: rsync
@@ -139,7 +139,7 @@ jobs:
       with:
         disable_annotations: true
     - name: Prepare, build and test
-      uses: vmactions/[email protected].8
+      uses: vmactions/[email protected].9
       with:
         usesh: true
         sync: rsync

src/uu/tee/src/tee.rs

@@ -443,11 +443,12 @@ pub fn ensure_stdout_not_broken() -> Result<bool> {
     // POLLRDBAND is the flag used by GNU tee.
     let mut pfds = [PollFd::new(out.as_fd(), PollFlags::POLLRDBAND)];
 
-    // Then, ensure that the pipe is not broken
-    let res = nix::poll::poll(&mut pfds, PollTimeout::NONE)?;
+    // Then, ensure that the pipe is not broken.
+    // Use ZERO timeout to return immediately - we just want to check the current state.
+    let res = nix::poll::poll(&mut pfds, PollTimeout::ZERO)?;
 
     if res > 0 {
-        // poll succeeded;
+        // poll returned with events ready - check if POLLERR is set (pipe broken)
         let error = pfds.iter().any(|pfd| {
             if let Some(revents) = pfd.revents() {
                 revents.contains(PollFlags::POLLERR)
@@ -458,8 +459,8 @@ pub fn ensure_stdout_not_broken() -> Result<bool> {
         return Ok(!error);
     }
 
-    // if res == 0, it means that timeout was reached, which is impossible
-    // because we set infinite timeout.
-    // And if res < 0, the nix wrapper should have sent back an error.
-    unreachable!();
+    // res == 0 means no events ready (timeout reached immediately with ZERO timeout).
+    // This means the pipe is healthy (not broken).
+    // res < 0 would be an error, but nix returns Err in that case.
+    Ok(true)
 }

util/build-gnu.sh

@@ -95,13 +95,13 @@ fi
 cd -
 
 # Pass the feature flags to make, which will pass them to cargo
-"${MAKE}" PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
+"${MAKE}" PROFILE="${PROFILE}" SKIP_UTILS=more CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
 # min test for SELinux
 [ "${SELINUX_ENABLED}" = 1 ] && touch g && "${PROFILE}"/stat -c%C g && rm g
 
 cp "${UU_BUILD_DIR}/install" "${UU_BUILD_DIR}/ginstall" # The GNU tests rename this script before running, to avoid confusion with the make target
 # Create *sum binaries
-for sum in b2sum b3sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum; do
+for sum in b2sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum; do
     sum_path="${UU_BUILD_DIR}/${sum}"
     test -f "${sum_path}" || (cd ${UU_BUILD_DIR} && ln -s "hashsum" "${sum}")
 done