Repository navigation
df: fix column width for non-ASCII headers - #15247
Merged
Merged
Conversation
Table::new seeded each column width with the header's length in bytes, while every cell, the header row included, is measured in display columns. A non-ASCII header therefore widened its column by one space per extra byte: with LANG=fr_FR.UTF-8, "Utilisé" gets 8 columns instead of 7, Cyrillic headers come out twice as wide as they should, CJK ones one and a half times. The header row already goes through the same width loop as the data rows, so drop the byte-length seed and let that loop size it. Closes #15246.
Hekzory
force-pushed
the
df-header-width
branch
from
October 11, 2026 11:36
541b7c2 to
537ca16
Compare
Contributor
|
Thanks for your PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #15246.
Table::newstarted each column at the header's length in bytes, while cells, the header row included, are measured in display columns. So a non-ASCII header made its column one space wider per extra byte. The header row already goes through the loop that widens columns for long values, so I dropped the byte-length start value and let that loop size it.The new test runs
df -h --output=used,target .withLANG=fr_FR.UTF-8and checks that the header line isUtilisé Monté sur. On main it isUtilisé Monté sur. With a local Russian ru-RU.ftl,df -hgoes from 96 to 59 columns. Output with ASCII headers doesn't change.