From abfc2ffaf5e83805e03579c5416e617899b2ef8b Mon Sep 17 00:00:00 2001 From: Pascal Bachor Date: Sun, 5 Jul 2026 16:21:30 +0200 Subject: [PATCH] ls: allow detached --sort, --format, --time, --block-size --- src/uu/ls/src/ls.rs | 4 ---- tests/by-util/test_ls.rs | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index a156f455f3..16c3755397 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -160,7 +160,6 @@ pub fn uu_app() -> Command { "commas", ])) .hide_possible_values(true) - .require_equals(true) .overrides_with_all([ options::FORMAT, options::format::COLUMNS, @@ -385,7 +384,6 @@ pub fn uu_app() -> Command { PossibleValue::new("birth").alias("creation"), ])) .hide_possible_values(true) - .require_equals(true) .overrides_with_all([options::TIME, options::time::ACCESS, options::time::CHANGE]), ) .arg( @@ -440,7 +438,6 @@ pub fn uu_app() -> Command { "extension", "width", ])) - .require_equals(true) .overrides_with_all([ options::SORT, options::sort::SIZE, @@ -627,7 +624,6 @@ pub fn uu_app() -> Command { .arg( Arg::new(options::size::BLOCK_SIZE) .long(options::size::BLOCK_SIZE) - .require_equals(true) .value_name("BLOCK_SIZE") .help(translate!("ls-help-block-size")) .overrides_with_all([options::size::SI, options::size::HUMAN_READABLE]), diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 663f66f1e2..ca652de647 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -7549,3 +7549,13 @@ fn test_ls_al_no_capabilities_insufficient_on_wasi() { out.stdout_str() ); } + +// https://github.com/uutils/coreutils/issues/13280 +// options `--sort`, `--format`, `--time`, and `--blocksize` may be detached +#[test] +fn test_long_options_detached() { + new_ucmd!().arg("--sort").arg("name").succeeds(); + new_ucmd!().arg("--format").arg("single-column").succeeds(); + new_ucmd!().arg("--time").arg("mtime").succeeds(); + new_ucmd!().arg("--block-size").arg("512").succeeds(); +}