fix unprintable (#233525)

This commit is contained in:
vcrhonek 2007-04-25 12:48:19 +00:00
parent 52ae45b28f
commit cd7e072c3c
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,12 @@
--- tcsh-6.14.00/tw.parse.c.old 2007-04-24 16:46:32.000000000 +0200
+++ tcsh-6.14.00/tw.parse.c 2007-04-24 17:02:28.000000000 +0200
@@ -2065,7 +2065,8 @@
(Strchr(val, 'x') != NULL);
for (i = 0; i < count; i++) { /* find widest string */
- maxwidth = max(maxwidth, (unsigned int) NLSStringWidth(items[i]));
+ if (NLSStringWidth(items[i]) != -1)
+ maxwidth = max(maxwidth, (unsigned int) NLSStringWidth(items[i]));
}
maxwidth += no_file_suffix ? 1 : 2; /* for the file tag and space */

View File

@ -3,7 +3,7 @@
Summary: An enhanced version of csh, the C shell Summary: An enhanced version of csh, the C shell
Name: tcsh Name: tcsh
Version: 6.14 Version: 6.14
Release: 15 Release: 16
License: BSD License: BSD
Group: System Environment/Shells Group: System Environment/Shells
Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@ -20,6 +20,7 @@ Patch9: tcsh-6.14.00-wide-seeks.patch
Patch10: tcsh-6.14.00-spell-crash.patch Patch10: tcsh-6.14.00-spell-crash.patch
Patch11: tcsh-6.14.00-remotehost.patch Patch11: tcsh-6.14.00-remotehost.patch
Patch12: tcsh-6.14.00-tinfo.patch Patch12: tcsh-6.14.00-tinfo.patch
Patch13: tcsh-6.14.00-unprintable.patch
Provides: csh = %{version} Provides: csh = %{version}
Requires(post): grep Requires(post): grep
Requires(postun): coreutils, grep Requires(postun): coreutils, grep
@ -50,6 +51,7 @@ like syntax.
%patch10 -p1 -b .spell-crash %patch10 -p1 -b .spell-crash
%patch11 -p1 -b .remotehost %patch11 -p1 -b .remotehost
%patch12 -p1 -b .tinfo %patch12 -p1 -b .tinfo
%patch13 -p1 -b .unprintable
%build %build
# For tcsh-6.14.00-tinfo.patch # For tcsh-6.14.00-tinfo.patch
@ -117,6 +119,10 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Apr 25 2007 Vitezslav Crhonek <vcrhonek@redhat.com> 6.14-16
- Fix floating exception in print_by_column() with unprintable characters
(#233525)
* Mon Feb 26 2007 Miloslav Trmac <mitr@redhat.com> - 6.14-15 * Mon Feb 26 2007 Miloslav Trmac <mitr@redhat.com> - 6.14-15
- Fix License: - Fix License:
Related: #226483. Related: #226483.