D10820.id28569.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10820.id28569.diff
View Options

	Index: usr.bin/grep/file.c
	===================================================================
	--- usr.bin/grep/file.c
	+++ usr.bin/grep/file.c
	@@ -213,29 +213,32 @@
	if (grep_lnbufgrow(len + LNBUFBUMP))
	goto error;
	memcpy(lnbuf + off, bufpos, len - off);
	- off = len;
	- if (grep_refill(f) != 0)
	- goto error;
	- if (bufrem == 0)
	- /* EOF: return partial line */
	- break;
	- if ((p = memchr(bufpos, fileeol, bufrem)) == NULL &&
	- filebehave != FILE_MMAP)
	- continue;
	- if (p == NULL) {
	- /* mmap EOF: return partial line, consume buffer */
	- diff = len;
	- } else {
	+ /*
	+ * If we've mmap()'d, then grep_refill will do nothing;
	+ * otherwise, there's a chance it will reveal a newline in
	+ * a part of the file we've not read yet, so keep going until
	+ * we hit EOL or EOF.
	+ */
	+ if (filebehave != FILE_MMAP) {
	+ off = len;
	+ if (grep_refill(f) != 0)
	+ goto error;
	+ if (bufrem == 0)
	+ /* EOF: return partial line */
	+ break;
	+ if ((p = memchr(bufpos, fileeol, bufrem)) == NULL)
	+ continue;
	/* got it: finish up the line (like code above) */
	++p;
	diff = p - bufpos;
	len += diff;
	- }
	- if (grep_lnbufgrow(len))
	- goto error;
	- memcpy(lnbuf + off, bufpos, diff);
	- bufrem -= diff;
	- bufpos = p;
	+ if (grep_lnbufgrow(len))
	+ goto error;
	+ memcpy(lnbuf + off, bufpos, diff);
	+ bufrem -= diff;
	+ bufpos = p;
	+ } else
	+ bufrem -= len;
	break;
	}
	*lenp = len;