rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: #2112870 - improve handling of control characters in unexpand

Browse Source
This commit is contained in:
Kamil Dudka 2022-08-08 12:44:08 +02:00
parent 4dcaf08c8b
commit f3c6ff7e2c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
coreutils-i18n.patch
View File

@ -19,7 +19,7 @@ Subject: [PATCH] coreutils-i18n.patch
src/local.mk | 4 +- src/local.mk | 4 +-
src/pr.c | 443 ++++++++++++++++++-- src/pr.c | 443 ++++++++++++++++++--
src/sort.c | 792 +++++++++++++++++++++++++++++++++--- src/sort.c | 792 +++++++++++++++++++++++++++++++++---
src/unexpand.c | 103 ++++- src/unexpand.c | 102 ++++-
src/uniq.c | 119 +++++- src/uniq.c | 119 +++++-
tests/Coreutils.pm | 3 + tests/Coreutils.pm | 3 +
tests/expand/mb.sh | 183 +++++++++ tests/expand/mb.sh | 183 +++++++++
@ -35,7 +35,7 @@ Subject: [PATCH] coreutils-i18n.patch
tests/misc/uniq.pl | 55 +++ tests/misc/uniq.pl | 55 +++
tests/pr/pr-tests.pl | 49 +++ tests/pr/pr-tests.pl | 49 +++
tests/unexpand/mb.sh | 172 ++++++++ tests/unexpand/mb.sh | 172 ++++++++
31 files changed, 3700 insertions(+), 242 deletions(-) 31 files changed, 3699 insertions(+), 242 deletions(-)
create mode 100644 lib/mbfile.c create mode 100644 lib/mbfile.c
create mode 100644 lib/mbfile.h create mode 100644 lib/mbfile.h
create mode 100644 m4/mbfile.m4 create mode 100644 m4/mbfile.m4
@ -4273,21 +4273,18 @@ index 7d6100f..04cd646 100644
{ {
/* Go back one column, and force recalculation of the /* Go back one column, and force recalculation of the
next tab stop. */ next tab stop. */
@@ -218,9 +277,11 @@ unexpand (void) @@ -220,16 +279,20 @@ unexpand (void)
next_tab_column = column;
tab_index -= !!tab_index;
} }
- else else
+ else if (!mb_iseq (c, '\n'))
{ {
- column++; - column++;
+ /* mb_width() returns 0 for control characters */ - if (!column)
+ const int width = mb_width (c); + const uintmax_t orig_column = column;
+ column += MAX(1, width); + column += mb_width (c);
if (!column) + if (column < orig_column)
die (EXIT_FAILURE, 0, _("input line is too long")); die (EXIT_FAILURE, 0, _("input line is too long"));
} }
@@ -228,8 +289,11 @@ unexpand (void)
if (pending) if (pending)
{ {
if (pending > 1 && one_blank_before_tab_stop) if (pending > 1 && one_blank_before_tab_stop)
@ -4301,7 +4298,7 @@ index 7d6100f..04cd646 100644
die (EXIT_FAILURE, errno, _("write error")); die (EXIT_FAILURE, errno, _("write error"));
pending = 0; pending = 0;
one_blank_before_tab_stop = false; one_blank_before_tab_stop = false;
@@ -239,16 +303,17 @@ unexpand (void) @@ -239,16 +302,17 @@ unexpand (void)
convert &= convert_entire_line || blank; convert &= convert_entire_line || blank;
} }

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 9.1 Version: 9.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ License: GPLv3+
Url: https://www.gnu.org/software/coreutils/ Url: https://www.gnu.org/software/coreutils/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@ -265,6 +265,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%license COPYING %license COPYING
%changelog %changelog
* Mon Aug 08 2022 Kamil Dudka <kdudka@redhat.com> - 9.1-5
- improve handling of control characters in unexpand (#2112870)
* Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 9.1-4 * Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 9.1-4
- prevent unexpand from failing on control characters (#2112870) - prevent unexpand from failing on control characters (#2112870)