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

ls: when -aA are provided, the order matters

Browse source
This commit is contained in:
Sylvestre Ledru 2022-03-20 19:58:21 +01:00
parent 04b219bdef
commit af8726af43
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

@ -1202,12 +1202,14 @@ pub fn uu_app<'a>() -> Command<'a> {
Arg::new(options::files::ALL) Arg::new(options::files::ALL)
.short('a') .short('a')
.long(options::files::ALL) .long(options::files::ALL)
.overrides_with(options::files::ALMOST_ALL)
.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(
Arg::new(options::files::ALMOST_ALL) Arg::new(options::files::ALMOST_ALL)
.short('A') .short('A')
.long(options::files::ALMOST_ALL) .long(options::files::ALMOST_ALL)
.overrides_with(options::files::ALL)
.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

@ -2869,3 +2869,25 @@ fn test_ls_context_format() {
); );
} }
} }
#[test]
#[allow(non_snake_case)]
fn test_ls_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("..");
}