Merge branch 'main' into cp-mv-xattr-enotsup-tests

ChrisDryden · web-flow · commit 88688441debe · 2026-01-06T13:38:49.000-05:00
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -579,7 +579,9 @@ jobs:
           - { os: ubuntu-latest  , target: riscv64gc-unknown-linux-musl  , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
           # - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_selinux           , use-cross: use-cross }
           - { os: ubuntu-latest  , target: i686-unknown-linux-gnu      , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
-          - { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix_musl , use-cross: use-cross }
+          # glibc 2.42 is important more than this platform
+          # Wait https://github.com/rust-lang/libc/pull/4914
+          #- { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix_musl , use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross, skip-publish: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl , use-cross: use-cross }
diff --git a/.github/workflows/FixPR.yml b/.github/workflows/FixPR.yml
@@ -46,7 +46,7 @@ jobs:
         # Ensure updated '*/Cargo.lock'
         # * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38)
         for dir in "." "fuzz"; do
-          ( cd "$dir" && (cargo fetch --locked --quiet || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
+          ( cd "$dir" && (cargo fetch --locked --quiet --target $(rustc --print host-tuple) || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
         done
     - name: Info
       shell: bash
@@ -65,7 +65,7 @@ jobs:
         cargo tree -V
         ## dependencies
         echo "## dependency list"
-        cargo fetch --locked --quiet
+        cargo fetch --locked --quiet --target $(rustc --print host-tuple)
         ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
         RUSTUP_TOOLCHAIN=stable cargo tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
     - name: Commit any changes (to '${{ env.BRANCH_TARGET }}')
diff --git a/.vscode/cspell.dictionaries/workspace.wordlist.txt b/.vscode/cspell.dictionaries/workspace.wordlist.txt
@@ -182,6 +182,7 @@ LINESIZE
 NAMESIZE
 RTLD_NEXT
     RTLD
+SIGABRT
 SIGINT
 SIGKILL
 SIGSTOP
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs
@@ -7,8 +7,7 @@
 
 use clap::builder::ValueParser;
 use clap::{Arg, ArgAction, Command};
-use std::ffi::{OsStr, OsString};
-use std::iter;
+use std::ffi::OsString;
 use uucore::checksum::compute::{
     ChecksumComputeOptions, figure_out_output_format, perform_checksum_computation,
 };
@@ -121,12 +120,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let length = maybe_sanitize_length(algo_cli, input_length)?;
 
-    let files = matches.get_many::<OsString>(options::FILE).map_or_else(
-        // No files given, read from stdin.
-        || Box::new(iter::once(OsStr::new("-"))) as Box<dyn Iterator<Item = &OsStr>>,
-        // At least one file given, read from them.
-        |files| Box::new(files.map(OsStr::new)) as Box<dyn Iterator<Item = &OsStr>>,
-    );
+    // clap provides the default value -. So we unwrap() safety.
+    let files = matches
+        .get_many::<OsString>(options::FILE)
+        .unwrap()
+        .map(|s| s.as_os_str());
 
     if check {
         // cksum does not support '--check'ing legacy algorithms
@@ -200,6 +198,8 @@ pub fn uu_app() -> Command {
                 .hide(true)
                 .action(ArgAction::Append)
                 .value_parser(ValueParser::os_string())
+                .default_value("-")
+                .hide_default_value(true)
                 .value_hint(clap::ValueHint::FilePath),
         )
         .arg(
diff --git a/src/uu/cp/src/copydir.rs b/src/uu/cp/src/copydir.rs
@@ -22,7 +22,6 @@ use uucore::fs::{
     FileInformation, MissingHandling, ResolveMode, canonicalize, path_ends_with_terminator,
 };
 use uucore::show;
-use uucore::show_error;
 use uucore::translate;
 use uucore::uio_error;
 use walkdir::{DirEntry, WalkDir};
@@ -513,7 +512,7 @@ pub(crate) fn copy_directory(
             }
 
             // Print an error message, but continue traversing the directory.
-            Err(e) => show_error!("{e}"),
+            Err(e) => show!(CpError::WalkDirErr(e)),
         }
     }
 
diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs
@@ -163,12 +163,11 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
     let strict = matches.get_flag("strict");
     let status = matches.get_flag("status");
 
-    let files = matches.get_many::<OsString>(options::FILE).map_or_else(
-        // No files given, read from stdin.
-        || Box::new(iter::once(OsStr::new("-"))) as Box<dyn Iterator<Item = &OsStr>>,
-        // At least one file given, read from them.
-        |files| Box::new(files.map(OsStr::new)) as Box<dyn Iterator<Item = &OsStr>>,
-    );
+    // clap provides the default value -. So we unwrap() safety.
+    let files = matches
+        .get_many::<OsString>(options::FILE)
+        .unwrap()
+        .map(|s| s.as_os_str());
 
     if check {
         // on Windows, allow --binary/--text to be used with --check
@@ -340,6 +339,8 @@ pub fn uu_app_common() -> Command {
                 .index(1)
                 .action(ArgAction::Append)
                 .value_name(options::FILE)
+                .default_value("-")
+                .hide_default_value(true)
                 .value_hint(clap::ValueHint::FilePath)
                 .value_parser(ValueParser::os_string()),
         )
diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs
@@ -95,7 +95,15 @@ impl Uniq {
 
             self.build_meta(&next_buf, &mut next_meta);
 
-            if self.keys_differ(&current_buf, &current_meta, &next_buf, &next_meta) {
+            if self.keys_are_equal(&current_buf, &current_meta, &next_buf, &next_meta) {
+                if self.all_repeated {
+                    self.print_line(writer, &current_buf, group_count, first_line_printed)?;
+                    first_line_printed = true;
+                    std::mem::swap(&mut current_buf, &mut next_buf);
+                    std::mem::swap(&mut current_meta, &mut next_meta);
+                }
+                group_count += 1;
+            } else {
                 if (group_count == 1 && !self.repeats_only)
                     || (group_count > 1 && !self.uniques_only)
                 {
@@ -105,14 +113,6 @@ impl Uniq {
                 std::mem::swap(&mut current_buf, &mut next_buf);
                 std::mem::swap(&mut current_meta, &mut next_meta);
                 group_count = 1;
-            } else {
-                if self.all_repeated {
-                    self.print_line(writer, &current_buf, group_count, first_line_printed)?;
-                    first_line_printed = true;
-                    std::mem::swap(&mut current_buf, &mut next_buf);
-                    std::mem::swap(&mut current_meta, &mut next_meta);
-                }
-                group_count += 1;
             }
             next_buf.clear();
         }
@@ -136,7 +136,7 @@ impl Uniq {
         if self.zero_terminated { 0 } else { b'\n' }
     }
 
-    fn keys_differ(
+    fn keys_are_equal(
         &self,
         first_line: &[u8],
         first_meta: &LineMeta,
@@ -146,11 +146,11 @@ impl Uniq {
         let first_slice = &first_line[first_meta.key_start..first_meta.key_end];
         let second_slice = &second_line[second_meta.key_start..second_meta.key_end];
 
-        if !self.ignore_case {
-            return first_slice != second_slice;
+        if self.ignore_case {
+            first_slice.eq_ignore_ascii_case(second_slice)
+        } else {
+            first_slice == second_slice
         }
-
-        !first_slice.eq_ignore_ascii_case(second_slice)
     }
 
     fn key_bounds(&self, line: &[u8]) -> (usize, usize) {
diff --git a/src/uucore/src/lib/features/fsext.rs b/src/uucore/src/lib/features/fsext.rs
@@ -420,37 +420,6 @@ fn mount_dev_id(mount_dir: &OsStr) -> String {
     }
 }
 
-#[cfg(any(
-    target_os = "freebsd",
-    target_vendor = "apple",
-    target_os = "netbsd",
-    target_os = "openbsd"
-))]
-use libc::c_int;
-#[cfg(any(
-    target_os = "freebsd",
-    target_vendor = "apple",
-    target_os = "netbsd",
-    target_os = "openbsd"
-))]
-unsafe extern "C" {
-    #[cfg(all(target_vendor = "apple", target_arch = "x86_64"))]
-    #[link_name = "getmntinfo$INODE64"]
-    fn get_mount_info(mount_buffer_p: *mut *mut StatFs, flags: c_int) -> c_int;
-
-    #[cfg(any(
-        target_os = "netbsd",
-        target_os = "openbsd",
-        all(target_vendor = "apple", target_arch = "aarch64")
-    ))]
-    #[link_name = "getmntinfo"]
-    fn get_mount_info(mount_buffer_p: *mut *mut StatFs, flags: c_int) -> c_int;
-
-    #[cfg(target_os = "freebsd")]
-    #[link_name = "getmntinfo"]
-    fn get_mount_info(mount_buffer_p: *mut *mut StatFs, flags: c_int) -> c_int;
-}
-
 use crate::error::UResult;
 #[cfg(any(
     target_os = "freebsd",
@@ -505,9 +474,9 @@ pub fn read_fs_list() -> UResult<Vec<MountInfo>> {
     ))]
     {
         let mut mount_buffer_ptr: *mut StatFs = ptr::null_mut();
-        let len = unsafe { get_mount_info(&raw mut mount_buffer_ptr, 1_i32) };
+        let len = unsafe { libc::getmntinfo(&raw mut mount_buffer_ptr, 1_i32) };
         if len < 0 {
-            return Err(USimpleError::new(1, "get_mount_info() failed"));
+            return Err(USimpleError::new(1, "getmntinfo() failed"));
         }
         let mounts = unsafe { slice::from_raw_parts(mount_buffer_ptr, len as usize) };
         Ok(mounts
diff --git a/src/uucore/src/lib/mods/error.rs b/src/uucore/src/lib/mods/error.rs
@@ -748,7 +748,9 @@ impl Error for ClapErrorWrapper {}
 // This is abuse of the Display trait
 impl Display for ClapErrorWrapper {
     fn fmt(&self, _f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
-        self.error.print().unwrap();
+        // Intentionally ignore the result - error.print() writes directly to stderr
+        // and we always return Ok(()) to satisfy Display's contract
+        let _ = self.error.print();
         Ok(())
     }
 }
diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs
@@ -833,6 +833,37 @@ fn test_child_when_pipe_in() {
     ts.ucmd().pipe_in("content").run().stdout_is("content");
 }
 
+/// Regression test for GitHub issue #9769
+/// https://github.com/uutils/coreutils/issues/9769
+///
+/// Bug: Utilities panic when output is redirected to /dev/full
+/// Location: src/uucore/src/lib/mods/error.rs:751 - `.unwrap()` causes panic
+///
+/// This test verifies that cat handles write errors to /dev/full gracefully
+/// instead of panicking with exit code 134 (SIGABRT).
+///
+/// Expected behavior with current BUGGY code:
+/// - Test WILL FAIL (cat panics with exit code 134)
+///
+/// Expected behavior after fix:
+/// - Test SHOULD PASS (cat exits gracefully with error code 1)
+// Regression test for issue #9769: graceful error handling when writing to /dev/full
+#[test]
+#[cfg(target_os = "linux")]
+fn test_write_error_handling() {
+    use std::fs::File;
+
+    let dev_full =
+        File::create("/dev/full").expect("Failed to open /dev/full - test must run on Linux");
+
+    new_ucmd!()
+        .pipe_in("test content that should cause write error to /dev/full")
+        .set_stdout(dev_full)
+        .fails()
+        .code_is(1)
+        .stderr_contains("No space left on device");
+}
+
 #[test]
 fn test_cat_eintr_handling() {
     // Test that cat properly handles EINTR (ErrorKind::Interrupted) during I/O operations
diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ use uucore::fs::{`
`22`	`22`	`FileInformation, MissingHandling, ResolveMode, canonicalize, path_ends_with_terminator,`
`23`	`23`	`};`
`24`	`24`	`use uucore::show;`
`25`		`-use uucore::show_error;`
`26`	`25`	`use uucore::translate;`
`27`	`26`	`use uucore::uio_error;`
`28`	`27`	`use walkdir::{DirEntry, WalkDir};`
`@@ -513,7 +512,7 @@ pub(crate) fn copy_directory(`
`513`	`512`	`}`
`514`	`513`
`515`	`514`	`// Print an error message, but continue traversing the directory.`
`516`		`- Err(e) => show_error!("{e}"),`
	`515`	`+ Err(e) => show!(CpError::WalkDirErr(e)),`
`517`	`516`	`}`
`518`	`517`	`}`
`519`	`518`
Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,9 @@ impl Error for ClapErrorWrapper {}`
`748`	`748`	`// This is abuse of the Display trait`
`749`	`749`	`impl Display for ClapErrorWrapper {`
`750`	`750`	`fn fmt(&self, _f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {`
`751`		`- self.error.print().unwrap();`
	`751`	`+ // Intentionally ignore the result - error.print() writes directly to stderr`
	`752`	`+ // and we always return Ok(()) to satisfy Display's contract`
	`753`	`+ let _ = self.error.print();`
`752`	`754`	`Ok(())`
`753`	`755`	`}`
`754`	`756`	`}`