Skip to content

ls: long mode format needs additional space when security or FACL symbol is present. #9913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgmarz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ls: long mode format needs additional space when security or FACL symbol is present. #9913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4ba0f3
test_ls: allow a space in lieu of security context (.) or FACL (+) sy…
sgmarz Dec 29, 2025
8f55102
ls: add padding for permission output if the security context (.) or …
sgmarz Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/uu/ls/src/ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2827,11 +2827,12 @@ fn display_item_long(
if item.security_context(config).len() > 1 {
// GNU `ls` uses a "." character to indicate a file with a security context,
// but not other alternate access method.
output_display.extend(b".");
output_display.extend(b". ");
} else if is_acl_set {
output_display.extend(b"+");
output_display.extend(b"+ ");
} else {
output_display.extend(b" ");
}
output_display.extend(b" ");
output_display.extend_pad_left(&display_symlink_count(md), padding.link_count);

if config.long.owner {
Expand Down
14 changes: 7 additions & 7 deletions tests/by-util/test_ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,28 +1529,28 @@ fn test_ls_long_formats() {
// Zero or one "." for indicating a file with security context

// Regex for three names, so all of author, group and owner
let re_three = Regex::new(r"[xrw-]{9}[.+]? \d ([-0-9_a-z.A-Z]+ ){3}0").unwrap();
let re_three = Regex::new(r"[xrw-]{9}[.+ ]? \d ([-0-9_a-z.A-Z]+ ){3}0").unwrap();

#[cfg(unix)]
let re_three_num = Regex::new(r"[xrw-]{9}[.+]? \d (\d+ ){3}0").unwrap();
let re_three_num = Regex::new(r"[xrw-]{9}[.+ ]? \d (\d+ ){3}0").unwrap();

// Regex for two names, either:
// - group and owner
// - author and owner
// - author and group
let re_two = Regex::new(r"[xrw-]{9}[.+]? \d ([-0-9_a-z.A-Z]+ ){2}0").unwrap();
let re_two = Regex::new(r"[xrw-]{9}[.+ ]? \d ([-0-9_a-z.A-Z]+ ){2}0").unwrap();

#[cfg(unix)]
let re_two_num = Regex::new(r"[xrw-]{9}[.+]? \d (\d+ ){2}0").unwrap();
let re_two_num = Regex::new(r"[xrw-]{9}[.+ ]? \d (\d+ ){2}0").unwrap();

// Regex for one name: author, group or owner
let re_one = Regex::new(r"[xrw-]{9}[.+]? \d [-0-9_a-z.A-Z]+ 0").unwrap();
let re_one = Regex::new(r"[xrw-]{9}[.+ ]? \d [-0-9_a-z.A-Z]+ 0").unwrap();

#[cfg(unix)]
let re_one_num = Regex::new(r"[xrw-]{9}[.+]? \d \d+ 0").unwrap();
let re_one_num = Regex::new(r"[xrw-]{9}[.+ ]? \d \d+ 0").unwrap();

// Regex for no names
let re_zero = Regex::new(r"[xrw-]{9}[.+]? \d 0").unwrap();
let re_zero = Regex::new(r"[xrw-]{9}[.+ ]? \d 0").unwrap();

scene
.ucmd()
Expand Down
Loading