Merge branch 'uutils:main' into main

Author: CyberSarvesh

.github/workflows/openbsd.yml

@@ -85,8 +85,7 @@ jobs:
           # * determine sub-crate utility list
           UTILITY_LIST="\$(./util/show-utils.sh --features ${{ matrix.job.features }})"
           ## Info
-          # environment
-          echo "## environment"
+          echo "::group::environment"
           echo "CI='${CI}'"
           echo "REPO_NAME='${REPO_NAME}'"
           echo "TEST_USER='${TEST_USER}'"
@@ -95,24 +94,27 @@ jobs:
           echo "FAULT_PREFIX='\${FAULT_PREFIX}'"
           echo "UTILITY_LIST='\${UTILITY_LIST}'"
           env | sort
-          # tooling info
-          echo "## tooling info"
+          echo "::endgroup::"
+          echo "::group::tooling info"
           cargo -V
           rustc -V
+          echo "::endgroup::"
           #
           # To ensure that files are cleaned up, we don't want to exit on error
           set +e
           unset FAULT
           ## cargo fmt testing
-          echo "## cargo fmt testing"
+          echo "::group::cargo fmt"
           # * convert any errors/warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
           S=\$(cargo fmt -- --check) && printf "%s\n" "\$S" || { printf "%s\n" "\$S" ; printf "%s\n" "\$S" | sed -E -n -e "s/^Diff[[:space:]]+in[[:space:]]+\${PWD//\//\\\\/}\/(.*)[[:space:]]+at[[:space:]]+[^0-9]+([0-9]+).*\$/::\${FAULT_TYPE} file=\1,line=\2::\${FAULT_PREFIX}: \\\`cargo fmt\\\`: style violation (file:'\1', line:\2; use \\\`cargo fmt -- \"\1\"\\\`)/p" ; FAULT=true ; }
+          echo "::endgroup::"
           ## cargo clippy lint testing
           if [ -z "\${FAULT}" ]; then
-            echo "## cargo clippy lint testing"
+            echo "::group::cargo clippy"
             CLIPPY_ARGS="--features ${{ matrix.job.features }} --fault-type \${FAULT_TYPE}"
             if [ -n "\${FAIL_ON_FAULT}" ]; then CLIPPY_ARGS="\${CLIPPY_ARGS} --fail-on-fault"; fi
             python3 util/run-clippy.py \${CLIPPY_ARGS} || FAULT=true
+            echo "::endgroup::"
           fi
           # Clean to avoid to rsync back the files and free up disk space
           cargo clean
@@ -179,18 +181,18 @@ jobs:
           mkdir -p ~/.cargo/bin
           # Note: nextest might not have OpenBSD builds, so we'll use regular cargo test
           ## Info
-          # environment
-          echo "## environment"
+          echo "::group::environment"
           echo "CI='${CI}'"
           echo "REPO_NAME='${REPO_NAME}'"
           echo "TEST_USER='${TEST_USER}'"
           echo "WORKSPACE_PARENT='${WORKSPACE_PARENT}'"
           echo "WORKSPACE='${WORKSPACE}'"
           env | sort
-          # tooling info
-          echo "## tooling info"
+          echo "::endgroup::"
+          echo "::group::tooling info"
           cargo -V
           rustc -V
+          echo "::endgroup::"
           #
           # To ensure that files are cleaned up, we don't want to exit on error
           set +e
@@ -203,14 +205,24 @@ jobs:
           # Avoid filling disk space
           export RUSTFLAGS="-C strip=symbols"
           # Use cargo test since nextest might not support OpenBSD
-          if (test -z "\$FAULT"); then cargo test --features '${{ matrix.job.features }}' || FAULT=1 ; fi
+          if (test -z "\$FAULT"); then
+            echo "::group::cargo test (workspace)"
+            cargo test --features '${{ matrix.job.features }}' || FAULT=1
+            echo "::endgroup::"
+          fi
           # There is no systemd-logind on OpenBSD, so test all features except feat_systemd_logind
           if (test -z "\$FAULT"); then
+            echo "::group::cargo test (uucore)"
             UUCORE_FEATURES=\$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "uucore") | .features | keys | .[]' | grep -v "feat_systemd_logind" | paste -s -d "," -)
             cargo test --features "\$UUCORE_FEATURES" -p uucore || FAULT=1
+            echo "::endgroup::"
           fi
           # Test building with make
-          if (test -z "\$FAULT"); then make MULTICALL=Y || FAULT=1 ; fi
+          if (test -z "\$FAULT"); then
+            echo "::group::make MULTICALL=Y"
+            make MULTICALL=Y || FAULT=1
+            echo "::endgroup::"
+          fi
           # Clean to avoid to rsync back the files and free up disk space
           cargo clean
           # Additional cleanup to free disk space

.vscode/cspell.dictionaries/jargon.wordlist.txt

@@ -42,6 +42,7 @@ discoverability
 duplicative
 dsync
 endianness
+endgroup
 enqueue
 ERANGE
 errored

src/uu/mv/src/mv.rs

@@ -1007,15 +1007,11 @@ fn copy_dir_contents(
     // Create the destination directory
     fs::create_dir_all(to)?;
 
-    // Preserve ownership (uid/gid) of the top-level directory
     #[cfg(unix)]
     {
+        // Preserve ownership (uid/gid) of the top-level directory
         let _ = preserve_ownership(from, to);
-    }
 
-    // Recursively copy contents
-    #[cfg(unix)]
-    {
         if let (Some(tracker), Some(scanner)) = (hardlink_tracker, hardlink_scanner) {
             copy_dir_contents_recursive(
                 from,

src/uu/unexpand/src/unexpand.rs

@@ -8,7 +8,7 @@
 use clap::{Arg, ArgAction, Command};
 use std::ffi::OsString;
 use std::fs::File;
-use std::io::{BufReader, BufWriter, Read, Stdout, Write, stdin, stdout};
+use std::io::{self, BufReader, BufWriter, Read, Stdin, Stdout, Write, stdin, stdout};
 use std::num::IntErrorKind;
 use std::path::Path;
 use std::str::from_utf8;
@@ -279,19 +279,32 @@ pub fn uu_app() -> Command {
         )
 }
 
-fn open(path: &OsString) -> UResult<BufReader<Box<dyn Read + 'static>>> {
-    let file_buf;
+enum Input {
+    Stdin(Stdin),
+    File(File),
+}
+
+impl Read for Input {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        match self {
+            Self::Stdin(s) => s.read(buf),
+            Self::File(f) => f.read(buf),
+        }
+    }
+}
+
+fn open(path: &OsString) -> UResult<BufReader<Input>> {
     let filename = Path::new(path);
     if filename.is_dir() {
         Err(USimpleError::new(
             1,
             translate!("unexpand-error-is-directory", "path" => filename.maybe_quote()),
         ))
     } else if path == "-" {
-        Ok(BufReader::new(Box::new(stdin()) as Box<dyn Read>))
+        Ok(BufReader::new(Input::Stdin(stdin())))
     } else {
-        file_buf = File::open(path).map_err_context(|| path.maybe_quote().to_string())?;
-        Ok(BufReader::new(Box::new(file_buf) as Box<dyn Read>))
+        let f = File::open(path).map_err_context(|| path.maybe_quote().to_string())?;
+        Ok(BufReader::new(Input::File(f)))
     }
 }
 

tests/by-util/test_touch.rs

@@ -622,6 +622,25 @@ fn test_touch_set_date7() {
     assert_eq!(mtime, expected);
 }
 
+/// Regression test for https://github.com/uutils/coreutils/issues/11804
+///
+/// Setting a pre-epoch date like `0000-01-01` used to panic on 32-bit targets
+/// because the i64 Unix timestamp (~-62 billion) overflowed the i32 `tv_sec`
+/// expected by the old nix-based implementation. After switching to rustix
+/// (which uses i64 `tv_sec` natively), this should succeed on all targets.
+#[test]
+#[cfg(target_os = "linux")]
+fn test_touch_set_date_year_zero() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let file = "test_touch_year_zero";
+
+    ucmd.args(&["-d", "0000-01-01", file])
+        .succeeds()
+        .no_stderr();
+
+    assert!(at.file_exists(file));
+}
+
 /// Test for setting the date by a relative time unit.
 #[test]
 fn test_touch_set_date_relative_smoke() {