add patch for search problem (search did not find string which occurs in a
line after '\0')
This commit is contained in:
parent
5575cd10ff
commit
ff3841ac7d
32
less-394-search.patch
Normal file
32
less-394-search.patch
Normal file
@ -0,0 +1,32 @@
|
||||
--- less-394/line.c.search 2005-12-03 21:20:32.000000000 +0100
|
||||
+++ less-394/line.c 2006-02-15 11:23:25.308694376 +0100
|
||||
@@ -1125,6 +1125,14 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ if (c == '\0')
|
||||
+ {
|
||||
+ /*
|
||||
+ * Pretend the line ended here
|
||||
+ */
|
||||
+ new_pos = ch_tell();
|
||||
+ break;
|
||||
+ }
|
||||
linebuf[n++] = c;
|
||||
c = ch_forw_get();
|
||||
}
|
||||
@@ -1198,6 +1206,14 @@
|
||||
*to = *fm;
|
||||
n = size_linebuf - old_size_linebuf;
|
||||
}
|
||||
+ if (c == '\0')
|
||||
+ {
|
||||
+ /*
|
||||
+ * Pretend the line ended here
|
||||
+ */
|
||||
+ new_pos = ch_tell() + 1;
|
||||
+ break;
|
||||
+ }
|
||||
linebuf[--n] = c;
|
||||
}
|
||||
if (linep != NULL)
|
@ -1,7 +1,7 @@
|
||||
Summary: A text file browser similar to more, but better.
|
||||
Name: less
|
||||
Version: 394
|
||||
Release: 2.2
|
||||
Release: 3
|
||||
License: GPL
|
||||
Group: Applications/Text
|
||||
Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
|
||||
@ -10,6 +10,8 @@ Source2: less.sh
|
||||
Source3: less.csh
|
||||
Patch0: less-382-fixline.patch
|
||||
Patch1: less-392-Foption.patch
|
||||
Patch2: less-394-search.patch
|
||||
|
||||
|
||||
URL: http://www.greenwoodsoftware.com/less/
|
||||
Buildroot: %{_tmppath}/%{name}-root
|
||||
@ -29,6 +31,7 @@ files, and you'll use it frequently.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fixline
|
||||
%patch1 -p1 -b .Foption
|
||||
%patch2 -p1 -b .search
|
||||
chmod -R a+w *
|
||||
|
||||
%build
|
||||
@ -54,6 +57,10 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Wed Feb 15 2006 Ivana Varekova <varekova@redhat.com> - 394-3
|
||||
- add patch for search problem (search did not find string which
|
||||
occurs in a line after '\0')
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 394-2.2
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user