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

auto-import changelog data from grep-2.5.1-7.8.src.rpm

Browse Source 
Mon Jan 05 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-7.8
- Fixed -o -i properly in a way that avoids glibc bug #112869.
This commit is contained in:
cvsdist 2004-09-09 05:53:11 +00:00
parent ac8957a28d
commit 45a556bf99
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
grep-2.5.1-oi.patch
View File

@ -1,46 +1,48 @@
--- grep-2.5.1/src/search.c.oi 2003-12-08 10:56:43.000000000 +0000 --- grep-2.5.1/lib/posix/regex.h.oi 2004-01-05 12:09:12.984391131 +0000
+++ grep-2.5.1/src/search.c 2003-12-08 11:01:11.000000000 +0000 +++ grep-2.5.1/lib/posix/regex.h 2004-01-05 12:09:24.717990622 +0000
@@ -219,6 +219,21 @@ @@ -109,6 +109,10 @@
If not set, \{, \}, {, and } are literals. */
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
patterns[pcount] = patterns0; +/* If this bit is set, then ignore case when matching.
+ If not set, then case is significant. */
+#define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
+
/* If this bit is set, +, ? and | aren't recognized as operators.
If not set, they are. */
#define RE_LIMITED_OPS (RE_INTERVALS << 1)
--- grep-2.5.1/src/search.c.oi 2004-01-05 12:07:00.550199415 +0000
+++ grep-2.5.1/src/search.c 2004-01-05 12:07:00.566197505 +0000
@@ -31,7 +31,7 @@
+ // patch ed@javabase.fsnet.co.uk #include "system.h"
+ if (match_icase #include "grep.h"
+#ifdef MBS_SUPPORT -#include "regex.h"
+ && MB_CUR_MAX == 1 +#include <regex.h>
+#endif /* MBS_SUPPORT */ #include "dfa.h"
+ ) #include "kwset.h"
+ { #include "error.h"
+ static char trans[NCHAR]; @@ -190,7 +190,7 @@
+ int i; size_t total = size;
+ for (i = 0; i < NCHAR; ++i) char const *motif = pattern;
+ trans[i] = TOLOWER (i);
+ patterns[pcount].regexbuf.translate = trans; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE);
+ } + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE | (match_icase ? RE_ICASE : 0));
+ // end patch dfasyntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE, match_icase, eolbyte);
+
if ((err = re_compile_pattern (motif, len, /* For GNU regex compiler we have to pass the patterns separately to detect
&(patterns[pcount].regexbuf))) != 0) @@ -268,12 +268,12 @@
error (2, 0, err);
@@ -302,6 +317,21 @@ if (strcmp (matcher, "awk") == 0)
error (2, errno, _("memory exhausted")); {
patterns[pcount] = patterns0; - re_set_syntax (RE_SYNTAX_AWK);
+ re_set_syntax (RE_SYNTAX_AWK | (match_icase ? RE_ICASE : 0));
dfasyntax (RE_SYNTAX_AWK, match_icase, eolbyte);
}
else
{
- re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP | (match_icase ? RE_ICASE : 0));
dfasyntax (RE_SYNTAX_POSIX_EGREP, match_icase, eolbyte);
}
+ // patch ed@javabase.fsnet.co.uk
+ if (match_icase
+#ifdef MBS_SUPPORT
+ && MB_CUR_MAX == 1
+#endif /* MBS_SUPPORT */
+ )
+ {
+ static char trans[NCHAR];
+ int i;
+ for (i = 0; i < NCHAR; ++i)
+ trans[i] = TOLOWER (i);
+ patterns[pcount].regexbuf.translate = trans;
+ }
+ // end patch
+
if ((err = re_compile_pattern (motif, len,
&(patterns[pcount].regexbuf))) != 0)
error (2, 0, err);

5
grep.spec
View File

@ -1,5 +1,5 @@
%define beta %nil %define beta %nil
%define rel 7.7 %define rel 7.8
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
@ -79,6 +79,9 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Mon Jan 5 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-7.8
- Fixed -o -i properly in a way that avoids glibc bug #112869.
* Wed Dec 10 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.7 * Wed Dec 10 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.7
- Another multibyte efficiency bug-fix (bug #111800). - Another multibyte efficiency bug-fix (bug #111800).