This commit is contained in:
parent
5a3c180369
commit
f3dafb1245
47
fix-binfile-detection.patch
Normal file
47
fix-binfile-detection.patch
Normal file
@ -0,0 +1,47 @@
|
||||
# Fix (bnc#446732) - less complains about binary file, when seeing utf8
|
||||
diff -up ./charset.c.orig ./charset.c
|
||||
--- ./charset.c.orig 2008-12-17 10:21:05.000000000 +0100
|
||||
+++ ./charset.c 2008-12-17 10:21:11.000000000 +0100
|
||||
@@ -393,8 +393,10 @@ init_charset()
|
||||
*/
|
||||
public int
|
||||
binary_char(c)
|
||||
- unsigned char c;
|
||||
+ LWCHAR c;
|
||||
{
|
||||
+ if (utf_mode)
|
||||
+ return (is_ubin_char(c));
|
||||
c &= 0377;
|
||||
return (chardef[c] & IS_BINARY_CHAR);
|
||||
}
|
||||
@@ -404,7 +406,7 @@ binary_char(c)
|
||||
*/
|
||||
public int
|
||||
control_char(c)
|
||||
- int c;
|
||||
+ LWCHAR c;
|
||||
{
|
||||
c &= 0377;
|
||||
return (chardef[c] & IS_CONTROL_CHAR);
|
||||
@@ -416,7 +418,7 @@ control_char(c)
|
||||
*/
|
||||
public char *
|
||||
prchar(c)
|
||||
- int c;
|
||||
+ LWCHAR c;
|
||||
{
|
||||
/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
|
||||
static char buf[32];
|
||||
@@ -811,7 +813,11 @@ static struct wchar_range comb_table[] =
|
||||
* dated 2005-11-30T00:58:48Z
|
||||
*/
|
||||
static struct wchar_range ubin_table[] = {
|
||||
- { 0x0000, 0x001F} /* Cc */, { 0x007F, 0x009F} /* Cc */,
|
||||
+ { 0x0000, 0x0007} /* Cc */,
|
||||
+ { 0x000B, 0x000C} /* Cc */,
|
||||
+ { 0x000E, 0x001A} /* Cc */,
|
||||
+ { 0x001C, 0x001F} /* Cc */,
|
||||
+ { 0x007F, 0x009F} /* Cc */,
|
||||
#if 0
|
||||
{ 0x00AD, 0x00AD} /* Cf */,
|
||||
#endif
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 10:31:47 CET 2008 - puzel@suse.cz
|
||||
|
||||
- add fix-binfile-detection.patch (bnc#446732)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 28 15:16:05 CEST 2008 - anosek@suse.cz
|
||||
|
||||
|
@ -27,7 +27,7 @@ Provides: normal-less jless
|
||||
Requires: file
|
||||
AutoReqProv: on
|
||||
Version: 424b
|
||||
Release: 1
|
||||
Release: 10
|
||||
Summary: Text File Browser and Pager Similar to more
|
||||
Url: http://www.greenwoodsoftware.com/less/
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
@ -45,6 +45,7 @@ Patch25: %{name}-%{version}-widechars.patch
|
||||
Patch26: %{name}-%{version}-shell.patch
|
||||
Patch27: %{name}-%{version}-save_line_position.patch
|
||||
Patch28: %{name}-%{version}-more.patch
|
||||
Patch29: fix-binfile-detection.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -71,6 +72,7 @@ Authors:
|
||||
%patch26
|
||||
%patch27
|
||||
%patch28
|
||||
%patch29 -p1
|
||||
#
|
||||
# the ./configure script is not writable for the normal user
|
||||
# rather fix permissions for all files
|
||||
@ -112,6 +114,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 17 2008 puzel@suse.cz
|
||||
- add fix-binfile-detection.patch (bnc#446732)
|
||||
* Thu Aug 28 2008 anosek@suse.cz
|
||||
- updated to version 424b
|
||||
* New "&" command allows filtering of lines based on a pattern.
|
||||
@ -425,7 +429,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- added new etc/lesskey and etc/lesskey.bin
|
||||
* Sat Apr 26 1997 florian@suse.de
|
||||
- update to new version 332
|
||||
* Mon Apr 14 1997 florian@suse.de
|
||||
* Sun Apr 13 1997 florian@suse.de
|
||||
- update to new version 330
|
||||
* Thu Jan 02 1997 bs@suse.de
|
||||
added new etc/lesskey*
|
||||
|
Loading…
x
Reference in New Issue
Block a user