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

ls: fix padding of size column when using -l

Browse source
This commit is contained in:
Daniel Hofstetter 2023-11-30 16:13:54 +01:00
parent 07241db6d8
commit 0ec6802459
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3228,7 +3228,7 @@ fn calculate_padding_collection(
padding_collections.minor = minor_len.max(padding_collections.minor);
padding_collections.size = size_len
.max(padding_collections.size)
.max(padding_collections.major + padding_collections.minor + 2usize);
.max(padding_collections.major);
}
}
}

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

@ -1023,6 +1023,21 @@ fn test_ls_long_format() {
).unwrap());
}
#[test]
fn test_ls_long_padding_of_size_column_with_multiple_files() {
let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("dir");
at.touch("dir/a");
at.touch("dir/b");
ucmd.arg("-l")
.arg("dir")
.succeeds()
.stdout_contains(" 0 ")
.stdout_does_not_contain(" 0 ");
}
/// This test tests `ls -laR --color`.
/// This test is mainly about coloring, but, the recursion, symlink `->` processing,
/// and `.` and `..` being present in `-a` all need to work for the test to pass.