svn commit: r244493 - head/usr.bin/grep

[Eitan Adler]

Author: eadler
Date: Thu Dec 20 17:38:14 2012
New Revision: 244493
URL: http://svnweb.freebsd.org/changeset/base/244493

Log:
  Make bsdgrep behave as gnugrep and as documented: -m should only stop
  reading the specific file, not any file.
  
  Tested by:	frogs (irc)
  Reviewed by:	gabor
  Approved by:	cperciva (implicit)
  MFC after:	1 week

Modified:
  head/usr.bin/grep/grep.c
  head/usr.bin/grep/grep.h
  head/usr.bin/grep/util.c

Modified: head/usr.bin/grep/grep.c
==============================================================================
--- head/usr.bin/grep/grep.c	Thu Dec 20 17:23:40 2012	(r244492)
+++ head/usr.bin/grep/grep.c	Thu Dec 20 17:38:14 2012	(r244493)
@@ -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);

Modified: head/usr.bin/grep/grep.h
==============================================================================
--- head/usr.bin/grep/grep.h	Thu Dec 20 17:23:40 2012	(r244492)
+++ head/usr.bin/grep/grep.h	Thu Dec 20 17:38:14 2012	(r244493)
@@ -115,6 +115,7 @@ extern bool	 Eflag, Fflag, Gflag, Hflag,
 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;

Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c	Thu Dec 20 17:23:40 2012	(r244492)
+++ head/usr.bin/grep/util.c	Thu Dec 20 17:38:14 2012	(r244493)
@@ -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);