mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-18 13:21:58 +02:00
fmt: interpret -w as an inclusive maximum
This aligns with `fold -w` and BSD `fmt` implementations. * src/fmt.c (fmt_paragraph): Check len <= max_width. * tests/fmt/width.sh: Add a new test. * tests/local.mk: Reference the new test. * NEWS: Mention the change in behavior. Addresses part of https://bugs.gnu.org/79497
This commit is contained in:
3
NEWS
3
NEWS
@@ -53,6 +53,9 @@ GNU coreutils NEWS -*- outline -*-
|
||||
|
||||
** Changes in behavior
|
||||
|
||||
'fmt' -w,--width no longer includes '\n' in the width of a line.
|
||||
I.e., the specified width is interpreted to be an _inclusive_ maximum.
|
||||
|
||||
'ptx' -t is no longer a no-op, and now sets the default width to 100 columns.
|
||||
|
||||
'timeout' now honors ignored signals and will not propagate them. E.g.,
|
||||
|
||||
@@ -908,7 +908,7 @@ fmt_paragraph (void)
|
||||
|
||||
len += (w - 1)->space + w->length; /* w > start >= word */
|
||||
}
|
||||
while (len < max_width);
|
||||
while (len <= max_width);
|
||||
start->best_cost = best + base_cost (start);
|
||||
}
|
||||
|
||||
|
||||
40
tests/fmt/width.sh
Executable file
40
tests/fmt/width.sh
Executable file
@@ -0,0 +1,40 @@
|
||||
#!/bin/sh
|
||||
# Exercise the fmt -w option.
|
||||
|
||||
# Copyright (C) 2026 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
|
||||
print_ver_ fmt
|
||||
|
||||
# Ensure width is max display width.
|
||||
# Before v9.10, width incorrectly included the \n character
|
||||
printf 'aa bb cc dd ee' | fmt -w 8 > out || fail=1
|
||||
cat <<\_EOF_ > exp || framework_failure_
|
||||
aa bb cc
|
||||
dd ee
|
||||
_EOF_
|
||||
compare exp out || fail=1
|
||||
|
||||
printf 'aa bb cc dd ee' | fmt -w 7 > out || fail=1
|
||||
cat <<\_EOF_ > exp || framework_failure_
|
||||
aa
|
||||
bb cc
|
||||
dd ee
|
||||
_EOF_
|
||||
compare exp out || fail=1
|
||||
|
||||
|
||||
Exit $fail
|
||||
@@ -251,6 +251,7 @@ all_tests = \
|
||||
tests/fmt/goal-option.sh \
|
||||
tests/fmt/long-line.sh \
|
||||
tests/fmt/non-space.sh \
|
||||
tests/fmt/width.sh \
|
||||
tests/misc/echo.sh \
|
||||
tests/env/env.sh \
|
||||
tests/env/env-signal-handler.sh \
|
||||
|
||||
Reference in New Issue
Block a user