136 Commits

Author SHA1 Message Date
marcel
120b82d368 Don't look for headers outside of the source or object directories. In
particular, don't use DESTDIR. Such creates an unnecessary dependency
on the build machine.

Obtained from:  Juniper Networks, Inc.
2013-05-21 17:30:27 +00:00
pfg
a054c02d31 grep: change some int types.
Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.

This is based on NetBSD's revision which says:

This change to NetBSD's version of GNU grep 2.5.1 (licenced under
GPLv2) was made without direct reference to any code licenced
under GPLv3.

Obtained from:	NetBSD
MFC after:	3 days
2013-05-20 03:15:25 +00:00
davidxu
9ce6a82d5d Make "-D skip" option work with FIFO by opening file in non-blocking mode.
Reviewed by:	jhb
Tested by:	delphij
2013-01-22 03:23:14 +00:00
obrien
0b7fec6762 Build and install a BSD licensed grep.
If WITH_BSD_GREP is not set, it will be 'bsdgrep' and GNUgrep will be
'[ef]grep'.  Otherwise, BSD-grep will be the grep family, and GNUgrep
will be 'gnugrep'.

Discussed with: brooks
2011-05-25 01:04:12 +00:00
obrien
6eaf14ce79 For files not named on the command line, only the basename is compared
to the exclude pattern.
Change this so that "grep --exclude='*/.svn/*' -[Rr] foo *" DWIM.

Obtained from:	dave+news001@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (Dave Gibson)
Obtained from:	comp.unix.questions [Thu, 15 Mar 2007 18:54:38 +0000]
Obtained from:	http://unix.derkeiler.com/Newsgroups/comp.unix.questions/2007-03/msg00046.html
2009-01-30 00:22:08 +00:00
trhodes
cb84ecb15c Add the -P option back, but with a note that it is not supported on FreeBSD.
Requested by:	ru
2006-10-11 09:52:32 +00:00
trhodes
6bf3709af8 grep -P xxx file.txt
"The -P option is not supported"
Removed from the manual page via this commit.

PR:	99831
2006-10-10 01:57:25 +00:00
tjr
0162e627f8 Correctly locate the character preceeding the matched string in -w
mode when in non-UTF-8 multibyte locales (e.g. EUC, GB2312, etc.).

PR:		91909
2006-02-19 04:27:39 +00:00
ru
c86d328d07 Fix a markup nit.
PR:		docs/88848
Prodded by:	remko
2005-12-18 12:09:23 +00:00
tjr
64e3944dba Fix 'grep -Fw' for encodings other than UTF-8 (RH bug #161700).
PR:		87969
Obtained from:	Fedora (Tim Waugh)
2005-10-25 09:18:50 +00:00
stefanf
34d1b4d779 Document [:blank:]. 2005-10-23 11:19:56 +00:00
jkim
c5ecef48ae Remove redundant string length check from the previous commit. 2005-10-21 15:17:18 +00:00
jkim
96a3131530 Fix a longstanding buglet in bz-prefixed grep(1). 2005-10-20 21:50:44 +00:00
tjr
4f902fd545 Pass the RE_ICASE flag to re_set_syntax() as appropriate to fix
case-insensitive matching (-i option) in certain multibyte locales.

Obtained from:	Fedora
2005-05-31 12:49:04 +00:00
tjr
3c94ccdb45 Add a note explaining what local modifications have been made to GNU grep,
and giving advice on importing future releases.
2005-05-14 06:33:23 +00:00
tjr
2f499f9763 Fixed -w handling for EGexecute.
Obtained from:	Fedora (Tim Waugh)
2005-05-14 06:13:23 +00:00
tjr
5364440b9f Automatically disable DFA when processing multibyte input. GREP_USE_DFA
environment variable overrides.

Obtained from:	Fedora (Tim Waugh)
2005-05-14 06:12:03 +00:00
tjr
bff87236c6 Better multibyte handling in EGexecute() and Fexecute(). Fixed -Fi for
multibyte input (RH bug #143079).

Obtained from:	Fedora (Jakub Jelinek, Tim Waugh)
2005-05-14 06:09:12 +00:00
tjr
e8d95bb287 Removed redundant (and incorrect) code in prline. Fixes grep -i --color "",
among other things.

PR:		79063
Obtained from:	Fedora (Tim Waugh)
2005-05-14 05:35:04 +00:00
tjr
a47b9a8adc Fix background colour problems with --color output (RH bug #138913).
Obtained from:	Karsten Hopp via Fedora
2005-05-14 05:26:48 +00:00
tjr
01956b0d09 Fixed a bug in the fgrep patch, exposed by the dfa-optional patch
(RH bug #138558). Removed bogus part of grep-2.5.1-fgrep patch.

Obtained from:	Fedora (Jakub Jelinek, Tim Waugh)
2005-05-14 04:17:07 +00:00
tjr
b191ef00d8 Fix dfa multibyte character class matching when -i is used (RH bug #123363).
Obtained from:	Fedora (Tim Waugh)
2005-05-14 03:18:20 +00:00
tjr
e4b49c8498 Remove mb-caching hack.
Obtained from:	Fedora (Tim Waugh)
2005-05-14 03:02:22 +00:00
obrien
55d920055d Fix regression in output with -R compared to previous version.
PR:		77466
Submitted by:	Andre Guibert de Bruet <andy@siliconlandmark.com>
2005-02-13 23:07:30 +00:00
keramida
457d89dc2b The correct name of the long option is --line-buffered,
not --line-bufferring.

PR:		docs/72985
Submitted by:	John Engelhart <johne@zang.com>
MFC after:	1 week
2004-11-09 17:00:06 +00:00
tjr
885cdf40be Change version string to distinguish our modified version of GNU grep
from the original.
2004-08-12 06:45:31 +00:00
tjr
71d184a8d2 Fix bug causing `[' to be wrongly included in character class expressions
in some multibyte locales (Red Hat bug #108484).

Obtained from:	Fedora (Tim Waugh)
2004-07-04 16:25:41 +00:00
tjr
ee5f93f56a Make grep run much (~10x) faster in multibyte locales by caching the wide
character representation of input data across calls to dfaexec(), and by
caching the lengths of character across calls to check_multibyte_string().

Obtained from:	Fedora (Tim Waugh)
2004-07-04 16:16:59 +00:00
tjr
6380609efc Avoid accessing accessing memory past the end of mb_properties in the
degenerate case of fgrep with an empty pattern in a multibyte locale.
Found by phkmalloc.
2004-07-04 14:00:25 +00:00
tjr
3aceb5c9da Improve case-insensitive matching in multibyte locales.
Obtained from:	Isamu Hasegawa (IBM) via Fedora
2004-07-04 11:58:10 +00:00
tjr
0c6755d771 Fix failure of fgrep to report some matches (Red Hat bug #116909).
Obtained from:	Fedora (Tim Waugh)
2004-07-04 11:33:49 +00:00
tjr
68fa9f1351 Use hard_locale() to check whether collating order is "hard" regardless
of whether NLS is enabled.
2004-07-04 10:24:48 +00:00
tjr
577b88a806 Ignore ENABLE_NLS when deciding whether we can use setlocale().
Use the same shortcut as glibc to test for the "C" or "POSIX" locale.
2004-07-04 10:22:50 +00:00
tjr
25b0d01442 Update for grep 2.5.1. 2004-07-04 10:05:37 +00:00
tjr
82d1ca3069 Merge local changes. 2004-07-04 10:02:03 +00:00
tjr
7bb57b0d67 This commit was generated by cvs2svn to compensate for changes in r131554,
which included commits to RCS files with non-trunk default branches.
2004-07-04 09:52:08 +00:00
tjr
d4c6119194 Import GNU grep 2.5.1 (trimmed) 2004-07-04 09:52:08 +00:00
ache
15469f77d2 Merge conflicts, upgrade 2004-03-01 08:37:20 +00:00
ache
a28ccb3d69 Trimmed grep 2.4.2 2004-03-01 08:24:49 +00:00
ache
3bd1cc91fa This commit was generated by cvs2svn to compensate for changes in r126432,
which included commits to RCS files with non-trunk default branches.
2004-03-01 08:24:49 +00:00
ache
2bf5bfe61f Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu 2004-02-17 05:38:45 +00:00
ache
24f49b8cb4 1) Remove files no longer needed.
2) Switch back to regex.h
2004-02-16 22:43:05 +00:00
ru
743cc6d002 Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
obrien
63bd46464d We HAVE_STPCPY now. 2002-10-20 07:50:20 +00:00
ru
0f00011b24 Added bzip2 variants to the NAME section.
Added missing break.
Remove the statement that -J requires zlib(3).
2002-10-07 09:08:07 +00:00
obrien
3079aa5131 Allow -J to simultaneously do non-bzip2 grepping.
Don't allow -J and -Z together.

Partially submitted by:	knu
2002-10-06 07:02:30 +00:00
obrien
16ce5cfd95 Create bzgrep. 2002-09-16 04:27:29 +00:00
keramida
d77d592ac1 Typo in [^[:alnum:]] character class.
PR:		docs/41728
Submitted by:	osgene@web.de
2002-08-31 02:26:19 +00:00
keramida
18c9f9fd09 Mention zegrep and zfgrep too,
and what their equivalent grep options are.

PR:		docs/35603
Submitted by:	"Gary W. Swearingen" <swear@blarg.net>
2002-07-11 20:12:15 +00:00
ru
bfc3ff5461 Removed glibc specific stuff.
PR:		docs/31431
2001-11-27 08:23:38 +00:00