Merge branch 'uutils:main' into cat-small-file

Author: oech3

src/bin/coreutils.rs

@@ -85,10 +85,10 @@ fn main() {
 
         match util {
             "--list" => {
-                // If --help is also present, show usage instead of list
-                if args.any(|arg| arg == "--help" || arg == "-h") {
-                    usage(&utils, binary_as_util);
-                    process::exit(0);
+                // we should fail with additional args https://github.com/uutils/coreutils/issues/11383#issuecomment-4082564058
+                if args.next().is_some() {
+                    let _ = writeln!(io::stderr(), "coreutils: invalid argument");
+                    process::exit(1);
                 }
                 let mut out = io::stdout().lock();
                 for util in utils.keys() {
@@ -156,8 +156,13 @@ fn main() {
             }
         }
     } else {
-        // no arguments provided
-        usage(&utils, binary_as_util);
-        process::exit(0);
+        // GNU just fails, but busybox tests needs usage
+        // todo: patch the test suite instead
+        if binary_as_util.ends_with("box") {
+            usage(&utils, binary_as_util);
+        } else {
+            let _ = writeln!(io::stderr(), "coreutils: missing argument");
+        }
+        process::exit(1);
     }
 }

src/uu/ls/locales/en-US.ftl

@@ -22,6 +22,7 @@ ls-error-cannot-open-directory-bad-descriptor = cannot open directory {$path}: B
 ls-error-unknown-io-error = unknown io error: {$path}, '{$error}'
 ls-error-invalid-block-size = invalid --block-size argument {$size}
 ls-error-dired-and-zero-incompatible = --dired and --zero are incompatible
+ls-error-not-directory = cannot access {$path}: Not a directory
 ls-error-not-listing-already-listed = {$path}: not listing already-listed directory
 ls-error-invalid-time-style = invalid --time-style argument {$style}
   Possible values are:

src/uu/ls/src/ls.rs

@@ -68,6 +68,7 @@ enum LsError {
     IOError(#[from] std::io::Error),
 
     #[error("{}", match .1.kind() {
+		ErrorKind::NotADirectory => translate!("ls-error-not-directory", "path" => .0.quote()),
         ErrorKind::NotFound => translate!("ls-error-cannot-access-no-such-file", "path" => .0.quote()),
         ErrorKind::PermissionDenied => match .1.raw_os_error().unwrap_or(1) {
             1 => translate!("ls-error-cannot-access-operation-not-permitted", "path" => .0.quote()),

src/uu/stdbuf/src/stdbuf.rs

@@ -33,14 +33,9 @@ mod options {
 
 #[cfg(all(
     not(feature = "feat_external_libstdbuf"),
-    any(
-        target_os = "linux",
-        target_os = "android",
-        target_os = "freebsd",
-        target_os = "netbsd",
-        target_os = "openbsd",
-        target_os = "dragonfly"
-    )
+    unix,
+    not(target_vendor = "apple"),
+    not(target_os = "cygwin")
 ))]
 const STDBUF_INJECT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/libstdbuf.so"));
 
@@ -84,29 +79,19 @@ enum ProgramOptionsError {
     ValueTooLarge(String),
 }
 
-#[cfg(any(
-    target_os = "linux",
-    target_os = "android",
-    target_os = "freebsd",
-    target_os = "netbsd",
-    target_os = "openbsd",
-    target_os = "dragonfly"
-))]
-#[expect(
-    clippy::unnecessary_wraps,
-    reason = "fn sig must match on all platforms"
-)]
-fn preload_strings() -> UResult<(&'static str, &'static str)> {
-    Ok(("LD_PRELOAD", "so"))
+#[cfg(all(unix, not(target_vendor = "apple"), not(target_os = "cygwin")))]
+fn preload_strings() -> (&'static str, &'static str) {
+    ("LD_PRELOAD", "so")
 }
 
 #[cfg(target_vendor = "apple")]
-#[expect(
-    clippy::unnecessary_wraps,
-    reason = "fn sig must match on all platforms"
-)]
-fn preload_strings() -> UResult<(&'static str, &'static str)> {
-    Ok(("DYLD_LIBRARY_PATH", "dylib"))
+fn preload_strings() -> (&'static str, &'static str) {
+    ("DYLD_LIBRARY_PATH", "dylib")
+}
+
+#[cfg(target_os = "cygwin")]
+fn preload_strings() -> (&'static str, &'static str) {
+    ("LD_PRELOAD", "dll")
 }
 
 fn check_option(matches: &ArgMatches, name: &str) -> Result<BufferType, ProgramOptionsError> {
@@ -149,7 +134,7 @@ fn get_preload_env(tmp_dir: &TempDir) -> UResult<(String, PathBuf)> {
     use std::fs::File;
     use std::io::Write;
 
-    let (preload, extension) = preload_strings()?;
+    let (preload, extension) = preload_strings();
     let inject_path = tmp_dir.path().join("libstdbuf").with_extension(extension);
 
     let mut file = File::create(&inject_path)?;
@@ -160,7 +145,7 @@ fn get_preload_env(tmp_dir: &TempDir) -> UResult<(String, PathBuf)> {
 
 #[cfg(feature = "feat_external_libstdbuf")]
 fn get_preload_env(_tmp_dir: &TempDir) -> UResult<(String, PathBuf)> {
-    let (preload, extension) = preload_strings()?;
+    let (preload, extension) = preload_strings();
 
     // Use the directory provided at compile time via LIBSTDBUF_DIR environment variable
     // This will fail to compile if LIBSTDBUF_DIR is not set, which is the desired behavior

tests/by-util/test_ls.rs

@@ -57,6 +57,20 @@ const COMMA_ARGS: &[&str] = &["-m", "--format=commas", "--for=commas"];
 
 const COLUMN_ARGS: &[&str] = &["-C", "--format=columns", "--for=columns"];
 
+#[test]
+#[cfg(unix)]
+fn test_directory_in_file() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+    at.touch("file");
+
+    scene
+        .ucmd()
+        .arg("file/missing")
+        .fails_with_code(2)
+        .stderr_is("ls: cannot access 'file/missing': Not a directory\n");
+}
+
 #[test]
 fn test_invalid_flag() {
     new_ucmd!()