Skip to content

ls: decouple ACL-marker separator from link-count width (#11790) #11813

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

Draft
sylvestre wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ls: decouple ACL-marker separator from link-count width (#11790) #11813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions src/uu/ls/src/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,10 +907,16 @@ fn display_item_long(
state.display_buf.push(b' ');
}

state.display_buf.extend_pad_left(
&display_symlink_count(md),
padding.link_count + usize::from(padding.has_alt_access),
);
// When any listed item carries an ACL or security-context marker,
// emit an extra separator space so the link-count column starts at
// a stable position regardless of this row's marker character.
if padding.has_alt_access {
state.display_buf.push(b' ');
}

state
.display_buf
.extend_pad_left(&display_symlink_count(md), padding.link_count);

if config.long.owner {
state.display_buf.push(b' ');
Expand Down Expand Up @@ -1061,10 +1067,10 @@ fn display_item_long(
state.display_buf.push(b'.');
}
state.display_buf.push(b' ');
state.display_buf.extend_pad_left(
"?",
padding.link_count + usize::from(padding.has_alt_access),
);
if padding.has_alt_access {
state.display_buf.push(b' ');
}
state.display_buf.extend_pad_left("?", padding.link_count);

if config.long.owner {
state.display_buf.push(b' ');
Expand Down
Loading