mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-06 09:17:25 +00:00
Code Issues Releases Activity
189,619 Commits 337 Branches 3,545 Tags 2 GiB
c6063d0da8
Commit Graph

138 Commits

Author SHA1 Message Date
Warner Losh
c6063d0da8 Use src.opts.mk in preference to bsd.own.mk except where we need stuff 
from the latter.
 2014-05-06 04:22:01 +00:00
Andrey A. Chernov
81191eeb58 Part of r245761 makes "grep -D skip" broken for pipes, i.e. 
echo xxx | grep -D skip xxx
returns nothing. Instead of just removing added S_ISFIFO condition
(originally absent in this version of grep), make it work as latest
GNU version does: don't skip directories and devices if fd == STDIN_FILENO.
 2013-08-08 11:53:47 +00:00
Jung-uk Kim
ee852b9c75 Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this 
actually reverts r250860 and r250861.

Reported by:	gjb, tinderbox
 2013-06-06 11:59:38 +00:00
Jung-uk Kim
a1e98bc995 Connect libgnuregex 2.17 to the build. 2013-06-05 21:31:06 +00:00
Marcel Moolenaar
bed3a130ea 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
Pedro F. Giffuni
025069f984 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
David Xu
87ec376216 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
David E. O'Brien
a23d1c70b3 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
David E. O'Brien
b29362d8dd 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
Tom Rhodes
1c6b148eb1 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
Tom Rhodes
ca56b49e0e 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
Tim J. Robbins
7c5f1a3fc5 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
Ruslan Ermilov
b5a8bae44b Fix a markup nit. 
PR:		docs/88848
Prodded by:	remko
 2005-12-18 12:09:23 +00:00
Tim J. Robbins
ebeecabae3 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
Stefan Farfeleder
4ce619ce5a Document [:blank:]. 2005-10-23 11:19:56 +00:00
Jung-uk Kim
4a4051fe5e Remove redundant string length check from the previous commit. 2005-10-21 15:17:18 +00:00
Jung-uk Kim
354cdde5b9 Fix a longstanding buglet in bz-prefixed grep(1). 2005-10-20 21:50:44 +00:00
Tim J. Robbins
10f38d95af 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
Tim J. Robbins
2d97dca698 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
Tim J. Robbins
9473343264 Fixed -w handling for EGexecute. 
Obtained from:	Fedora (Tim Waugh)
 2005-05-14 06:13:23 +00:00
Tim J. Robbins
4475bed3d2 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
Tim J. Robbins
aed59eaecf 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
Tim J. Robbins
712fe40aed 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
Tim J. Robbins
833d4d167b Fix background colour problems with --color output (RH bug #138913). 
Obtained from:	Karsten Hopp via Fedora
 2005-05-14 05:26:48 +00:00
Tim J. Robbins
1bd8c187c0 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
Tim J. Robbins
e20df16c79 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
Tim J. Robbins
52e523ead7 Remove mb-caching hack. 
Obtained from:	Fedora (Tim Waugh)
 2005-05-14 03:02:22 +00:00
David E. O'Brien
c34acf4a4c 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
Giorgos Keramidas
e23bfceab5 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
Tim J. Robbins
bfdbe5d98d Change version string to distinguish our modified version of GNU grep 
from the original.
 2004-08-12 06:45:31 +00:00
Tim J. Robbins
95cc51cfbd 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
Tim J. Robbins
2af417add4 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
Tim J. Robbins
7358ecc6b6 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
Tim J. Robbins
91a4826a49 Improve case-insensitive matching in multibyte locales. 
Obtained from:	Isamu Hasegawa (IBM) via Fedora
 2004-07-04 11:58:10 +00:00
Tim J. Robbins
a7e3f3f0db 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
Tim J. Robbins
dddd0d87a3 Use hard_locale() to check whether collating order is "hard" regardless 
of whether NLS is enabled.
 2004-07-04 10:24:48 +00:00
Tim J. Robbins
1188285e9b 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
Tim J. Robbins
19b0d58f6f Update for grep 2.5.1. 2004-07-04 10:05:37 +00:00
Tim J. Robbins
e5978bf334 Merge local changes. 2004-07-04 10:02:03 +00:00
Tim J. Robbins
d1e9179e8c 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
Tim J. Robbins
6fdbbb5487 Import GNU grep 2.5.1 (trimmed) 2004-07-04 09:52:08 +00:00
Andrey A. Chernov
0416b7503d Merge conflicts, upgrade 2004-03-01 08:37:20 +00:00
Andrey A. Chernov
7a39f4da90 Trimmed grep 2.4.2 2004-03-01 08:24:49 +00:00
Andrey A. Chernov
cdd3ecb3a1 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
Andrey A. Chernov
49b4df9afb Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu 2004-02-17 05:38:45 +00:00
Andrey A. Chernov
90fc35042b 1) Remove files no longer needed. 
2) Switch back to regex.h
 2004-02-16 22:43:05 +00:00
Ruslan Ermilov
47d7e8a96f Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
David E. O'Brien
597e16e012 We HAVE_STPCPY now. 2002-10-20 07:50:20 +00:00
Ruslan Ermilov
d40fe4078a 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
David E. O'Brien
0bd38bab78 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