diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/ls.c | 6 | ||||
| -rwxr-xr-x | tests/ls/w-option.sh | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -4,6 +4,9 @@ GNU coreutils NEWS -*- outline -*- ** Bug fixes + ls no longer prematurely wraps lines when printing short file names. + [bug introduced in 5.1.0] + shred again uses defined patterns for all iteration counts. [bug introduced in coreutils-5.93] @@ -1979,7 +1979,11 @@ decode_switches (int argc, char **argv) } } - max_idx = MAX (1, line_length / MIN_COLUMN_WIDTH); + /* Determine the max possible number of display columns. */ + max_idx = line_length / MIN_COLUMN_WIDTH; + /* Account for first display column not having a separator, + or line_lengths shorter than MIN_COLUMN_WIDTH. */ + max_idx += line_length % MIN_COLUMN_WIDTH != 0; filename_quoting_options = clone_quoting_options (NULL); if (get_quoting_style (filename_quoting_options) == escape_quoting_style) diff --git a/tests/ls/w-option.sh b/tests/ls/w-option.sh index f49c02815..6361aaf59 100755 --- a/tests/ls/w-option.sh +++ b/tests/ls/w-option.sh @@ -41,4 +41,8 @@ compare exp out || fail=1 # Ensure that 0 line length doesn't cause division by zero TERM=xterm ls -w0 -x --color=always || fail=1 +# coreutils <= 8.24 could display 1 column too few +ls -w4 -x -T0 a b > out || fail=1 +compare exp out || fail=1 + Exit $fail |