mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
cut: treat -b2-,3- like -b2-, not like -b3-
* src/cut.c (set_fields): When two right-open-ended ranges are specified, don't blindly let the latter one take precedence over the former. Instead, use the union of the ranges. * tests/misc/cut.pl: Add tests to exercise this. * NEWS (Bug fixes): Mention it. Reported by Marcel Böhme in http://bugs.gnu.org/12966 Thanks to Berhard Voelker for catching log and NEWS typos.
This commit is contained in:
1 parent
6f374d7c42
commit
1b874511b6
3 files changed
+11
-2
No files matched your search
@@ -14,6 +14,10 @@ GNU coreutils NEWS -*- outline -*-
|
||||
Instead, cut now fails and emits an appropriate diagnostic.
|
||||
[This bug was present in "the beginning".]
|
||||
|
||||
cut now handles overlapping to-EOL ranges properly. Before, it would
|
||||
interpret "-b2-,3-" like "-b3-". Now it's treated like "-b2-".
|
||||
[This bug was present in "the beginning".]
|
||||
|
||||
install -m M SOURCE DEST no longer has a race condition where DEST's
|
||||
permissions are temporarily derived from SOURCE instead of from M.
|
||||
|
||||
|
||||
@@ -391,8 +391,10 @@ set_fields (const char *fieldstr)
|
||||
In any case, 'initial' contains the start of the range. */
|
||||
if (!rhs_specified)
|
||||
{
|
||||
/* 'n-'. From 'initial' to end of line. */
|
||||
eol_range_start = initial;
|
||||
/* 'n-'. From 'initial' to end of line. If we've already
|
||||
seen an M- range, ignore subsequent N- unless N < M. */
|
||||
if (eol_range_start == 0 || initial < eol_range_start)
|
||||
eol_range_start = initial;
|
||||
field_found = true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -163,6 +163,9 @@ my @Tests =
|
||||
['big-unbounded-b', '--output-d=:', '-b1234567890-', {IN=>''}, {OUT=>''}],
|
||||
['big-unbounded-c', '--output-d=:', '-c1234567890-', {IN=>''}, {OUT=>''}],
|
||||
['big-unbounded-f', '--output-d=:', '-f1234567890-', {IN=>''}, {OUT=>''}],
|
||||
|
||||
['overlapping-unbounded-1', '-b3-,2-', {IN=>"1234\n"}, {OUT=>"234\n"}],
|
||||
['overlapping-unbounded-2', '-b2-,3-', {IN=>"1234\n"}, {OUT=>"234\n"}],
|
||||
);
|
||||
|
||||
if ($mb_locale ne 'C')
|
||||
|
||||
Reference in new issue
Block a user