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

- Fix behavior of --null to match GNU grep

Browse Source 
PR:		bin/162906
Submitted by:	Jan Beich <jbeich@tormail.net>
MFC after:	3 days
This commit is contained in:
Gabor Kovesdan 2011-11-28 20:00:31 +00:00
parent 2b8895cd74
commit f0c94259d6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228093
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,9 +246,9 @@ procfile(const char *fn)
printf("%u\n", c);
}
if (lflag && !qflag && c != 0)
printf("%s\n", fn);
printf("%s%c", fn, nullflag ? 0 : '\n');
if (Lflag && !qflag && c == 0)
printf("%s\n", fn);
printf("%s%c", fn, nullflag ? 0 : '\n');
if (c && !cflag && !lflag && !Lflag &&
binbehave == BINFILE_BIN && f->binary && !qflag)
printf(getstr(8), fn);
@ -440,13 +440,13 @@ printline(struct str *line, int sep, regmatch_t *matches, int m)
int i, n = 0;
if (!hflag) {
if (nullflag == 0)
if (!nullflag) {
fputs(line->file, stdout);
else {
++n;
} else {
printf("%s", line->file);
putchar(0);
}
++n;
}
if (nflag) {
if (n > 0)