Page MenuHomeFreeBSD
Differential D19782

jhb@ will take over as mentor to anish@
ClosedPublic
Actions

Authored by jrm on Apr 1 2019, 8:05 PM.
Tags
None
Referenced Files
F114690769: D19782.id55702.diff
Tue, Apr 15, 12:26 PM
Unknown Object (File)
Sun, Apr 13, 9:53 PM
Unknown Object (File)
Tue, Apr 8, 11:34 PM
Unknown Object (File)
Sat, Mar 22, 7:04 AM
Unknown Object (File)
Feb 28 2025, 4:13 PM
Unknown Object (File)
Feb 23 2025, 8:01 AM
Unknown Object (File)
Feb 7 2025, 12:22 AM
Unknown Object (File)
Feb 2 2025, 2:11 AM
View All 73 Files
Subscribers
imp

Details

Reviewers
seanc
brooks
Group Reviewers
Core Team
Commits
rS345786: Set jhb@ as new mentor to anish@
Summary

jhb@ will take over as mentor to anish@

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
svnadmin/
conf/
2 lines

Diff 55702

View Options

svnadmin/conf/mentors

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }