ls: fix alignment with locale formatted --size

Fix allocated size alignment in locales with multi-byte grouping chars.
Tested with: LC_ALL=sv_SE.utf8 ls --size --block-size=\'k

* src/ls.c (print_file_name_and_frills): Don't rely on
printf("%*s", width, string) to pad multi-byte strings appropriately.
Instead work out the padding required and use:
printf("%*s%s", padding, "", string) to pad multi-byte appropriately.
* tests/ls/block-size.sh: Add a test case.
* NEWS: Mention the bug fix.
Fixes https://bugs.gnu.org/79347

1 files changed, 19 insertions, 2 deletions

diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh
index 9c092f037..501c7f82b 100755
--- a/tests/ls/block-size.sh
+++ b/tests/ls/block-size.sh
@@ -26,9 +26,9 @@ mkdir sub
 cd sub
 
 for size in 1024 4096 262144; do
-  echo foo | dd conv=sync bs=$size >file$size || fail=1
+  echo foo | dd conv=sync bs=$size >file$size || framework_failure_
 done
-touch -d '2001-01-01 00:00' file* || fail=1
+touch -d '2001-01-01 00:00' file* || framework_failure_
 
 size_etc='s/[^ ]* *[^ ]* *//'
 
@@ -183,4 +183,21 @@ EOF
 
 compare exp out || fail=1
 
+# Ensure --size alignment with multi-byte grouping chars
+# which wasn't the case before coreutils v9.8
+cd sub
+for sizem in 1 10; do
+  echo foo |
+    dd conv=sync bs=$((sizem*1024*1024)) >file${sizem}M || framework_failure_
+done
+
+# If any of these unavailable, the C fallback should also be aligned
+for loc in sv_SE.UTF-8 $LOCALE_FR_UTF8; do
+  test $(LC_ALL=$loc ls -s1 --block-size=\'k |
+         tail -n+2 | cut -dK -f1 |
+         while IFS= read size; do
+           printf '%s\n' "$size" | LC_ALL=$loc wc -L
+         done | uniq | wc -l) = 1 || fail=1
+done
+
 Exit $fail