commit - 285b4f85c0dff0aa5019ee93c17d1f8c734eb030
commit + 1a84af59e08c39200775a68b6af7175a6bcd044e
blob - c90be40504c4338c9cf1e994fddf4c32b76d51e8
blob + 777bd1e8b04d165161aea8558b5c64b1490ef17c
--- src/cmd/grep/grep.h
+++ src/cmd/grep/grep.h
* if a line requires multiple reads, we keep shifting
* buf down into pre and then do another read into
* buf. so you'll get the last 16-32k of the matching line.
- * if pre were smaller than buf you'd get a suffix of the
+ * if h were smaller than buf you'd get a suffix of the
* line with a hole cut out.
*/
uchar pre[16*1024]; /* to save to previous '\n' */
uchar buf[16*1024]; /* input buffer */
- };
+ } u;
} u;
EXTERN char *filename;
blob - f2a6e040465890d6aef6cb0a21680cd65b70f143
blob + 004d1b72c46013d6418ec0bf424603faf2c80ce1
--- src/cmd/grep/main.c
+++ src/cmd/grep/main.c
eof = 0;
empty = 1;
nl = 0;
- lp = u.buf;
+ lp = u.u.buf;
bol = lp;
loop0:
n = lp-bol;
- if(n > sizeof(u.pre))
- n = sizeof(u.pre);
- memmove(u.buf-n, bol, n);
- bol = u.buf-n;
- n = read(fid, u.buf, sizeof(u.buf));
+ if(n > sizeof(u.u.pre))
+ n = sizeof(u.u.pre);
+ memmove(u.u.buf-n, bol, n);
+ bol = u.u.buf-n;
+ n = read(fid, u.u.buf, sizeof(u.u.buf));
/* if file has no final newline, simulate one to emit matches to last line */
if(n > 0) {
empty = 0;
- nl = u.buf[n-1]=='\n';
+ nl = u.u.buf[n-1]=='\n';
} else {
if(n < 0){
fprint(2, "grep: read error on %s: %r\n", file);
return count != 0;
}
if(!eof && !nl && !empty) {
- u.buf[0] = '\n';
+ u.u.buf[0] = '\n';
n = 1;
eof = 1;
}
Bflush(&bout);
return count != 0;
}
- lp = u.buf;
+ lp = u.u.buf;
elp = lp+n;
if(flag & Iflag)
goto loopi;