RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

ls: support multiple -a or -A

Browse source
This commit is contained in:
Sylvestre Ledru 2022-03-21 13:32:23 +01:00
parent 3009c73e9c
commit 187bddb6af
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/ls/src/ls.rs
View file

@ -1204,6 +1204,7 @@ pub fn uu_app<'a>() -> Command<'a> {
.long(options::files::ALL) .long(options::files::ALL)
// Overrides -A (as the order matters) // Overrides -A (as the order matters)
.overrides_with(options::files::ALMOST_ALL) .overrides_with(options::files::ALMOST_ALL)
.multiple_occurrences(true)
.help("Do not ignore hidden files (files with names that start with '.')."), .help("Do not ignore hidden files (files with names that start with '.')."),
) )
.arg( .arg(
@ -1212,6 +1213,7 @@ pub fn uu_app<'a>() -> Command<'a> {
.long(options::files::ALMOST_ALL) .long(options::files::ALMOST_ALL)
// Overrides -a (as the order matters) // Overrides -a (as the order matters)
.overrides_with(options::files::ALL) .overrides_with(options::files::ALL)
.multiple_occurrences(true)
.help( .help(
"In a directory, do not ignore all file names that start with '.', \ "In a directory, do not ignore all file names that start with '.', \
only ignore '.' and '..'.", only ignore '.' and '..'.",

22
tests/by-util/test_ls.rs
View file

@ -2891,3 +2891,25 @@ fn test_ls_a_A() {
.stdout_does_not_contain(".") .stdout_does_not_contain(".")
.stdout_does_not_contain(".."); .stdout_does_not_contain("..");
} }
#[test]
#[allow(non_snake_case)]
fn test_ls_multiple_a_A() {
let scene = TestScenario::new(util_name!());
scene
.ucmd()
.arg("-a")
.arg("-a")
.succeeds()
.stdout_contains(".")
.stdout_contains("..");
scene
.ucmd()
.arg("-A")
.arg("-A")
.succeeds()
.stdout_does_not_contain(".")
.stdout_does_not_contain("..");
}