d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make bsdgrep behave as gnugrep and as documented: -m should only stop

Browse Source 
reading the specific file, not any file.

Tested by:	frogs (irc)
Reviewed by:	gabor
Approved by:	cperciva (implicit)
MFC after:	1 week
This commit is contained in:
Eitan Adler 2012-12-20 17:38:14 +00:00
parent f578aba724
commit 924500b74d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=244493
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/grep/grep.c
View File

@ -108,6 +108,7 @@ bool iflag; /* -i: ignore case */
bool lflag; /* -l: only show names of files with matches */
bool mflag; /* -m x: stop reading the files after x matches */
long long mcount; /* count for -m */
long long mlimit; /* requested value for -m */
bool nflag; /* -n: show line numbers in front of matching lines */
bool oflag; /* -o: print only matching part */
bool qflag; /* -q: quiet mode (don't output anything) */
@ -524,7 +525,7 @@ main(int argc, char *argv[])
case 'm':
mflag = true;
errno = 0;
mcount = strtoll(optarg, &ep, 10);
mlimit = mcount = strtoll(optarg, &ep, 10);
if (((errno == ERANGE) && (mcount == LLONG_MAX)) ||
((errno == EINVAL) && (mcount == 0)))
err(2, NULL);

1
usr.bin/grep/grep.h
View File

@ -115,6 +115,7 @@ extern bool Eflag, Fflag, Gflag, Hflag, Lflag,
extern bool dexclude, dinclude, fexclude, finclude, lbflag, nullflag;
extern unsigned long long Aflag, Bflag;
extern long long mcount;
extern long long mlimit;
extern char *label;
extern const char *color;
extern int binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave;

3
usr.bin/grep/util.c
View File

@ -176,8 +176,7 @@ procfile(const char *fn)
mode_t s;
int c, t;
if (mflag && (mcount <= 0))
return (0);
mcount = mlimit;
if (strcmp(fn, "-") == 0) {
fn = label != NULL ? label : getstr(1);