rpms/grep
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed a bug in the fgrep patch, exposed by the dfa-optional patch (bug

Browse Source 
#138558).
This commit is contained in:
Tim Waugh 2004-11-18 13:30:38 +00:00
parent 8c440df2d2
commit 41ed4935a4
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
grep-2.5.1-dfa-optional.patch
View File

@ -64,16 +64,3 @@
goto success_in_beg_and_end; goto success_in_beg_and_end;
} }
else else
@@ -450,7 +475,11 @@
if ((start == 0 || !WCHAR ((unsigned char) beg[start - 1]))
&& (len == end - beg - 1
|| !WCHAR ((unsigned char) beg[start + len])))
- goto success_in_start_and_len;
+ {
+ if (len == 0)
+ len++;
+ goto success_in_start_and_len;
+ }
if (len > 0)
{
/* Try a shorter length anchored at the same place. */

2
grep-2.5.1-fgrep.patch
View File

@ -56,7 +56,7 @@
&& (len == end - beg - 1 && (len == end - beg - 1
|| !WCHAR ((unsigned char) beg[start + len]))) || !WCHAR ((unsigned char) beg[start + len])))
- goto success; - goto success;
+ goto success_in_start_and_len; + goto success_in_beg_and_end;
if (len > 0) if (len > 0)
{ {
/* Try a shorter length anchored at the same place. */ /* Try a shorter length anchored at the same place. */

6
grep.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU versions of grep pattern matching utilities. Summary: The GNU versions of grep pattern matching utilities.
Name: grep Name: grep
Version: 2.5.1 Version: 2.5.1
Release: 39 Release: 40
License: GPL License: GPL
Group: Applications/Text Group: Applications/Text
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@ -85,6 +85,10 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Thu Nov 18 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-40
- Fixed a bug in the fgrep patch, exposed by the dfa-optional patch
(bug #138558).
* Tue Nov 16 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-39 * Tue Nov 16 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-39
- Fixed last patch. - Fixed last patch.