Module Name: src
Committed By: christos
Date: Sat Jun 20 23:23:12 UTC 2009
Modified Files:
src/dist/nawk: lib.c
Log Message:
PR/30294: John Darrow: nawk doesn't handle RS as a RE but as a single character
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/dist/nawk/lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nawk/lib.c
diff -u src/dist/nawk/lib.c:1.16 src/dist/nawk/lib.c:1.17
--- src/dist/nawk/lib.c:1.16 Thu Mar 12 09:04:01 2009
+++ src/dist/nawk/lib.c Sat Jun 20 19:23:12 2009
@@ -210,22 +210,62 @@
;
if (c != EOF)
ungetc(c, inf);
- }
- for (rr = buf; ; ) {
- for (; (c=getc(inf)) != sep && c != EOF; ) {
- if (rr-buf+1 > bufsize)
- if (!adjbuf(&buf, &bufsize, 1+rr-buf, recsize, &rr, "readrec 1"))
- FATAL("input record `%.30s...' too long", buf);
+ } else if ((*RS)[1]) {
+ fa *pfa = makedfa(*RS, 1);
+ int tempstat = pfa->initstat;
+ char *brr = buf;
+ char *rrr = NULL;
+ int x;
+ for (rr = buf; ; ) {
+ while ((c = getc(inf)) != EOF) {
+ if (rr-buf+3 > bufsize)
+ if (!adjbuf(&buf, &bufsize, 3+rr-buf,
+ recsize, &rr, "readrec 2"))
+ FATAL("input record `%.30s...'"
+ " too long", buf);
+ *rr++ = c;
+ *rr = '\0';
+ if (!(x = nematch(pfa, brr))) {
+ pfa->initstat = tempstat;
+ if (rrr) {
+ rr = rrr;
+ ungetc(c, inf);
+ break;
+ }
+ } else {
+ pfa->initstat = 2;
+ brr = rrr = rr = patbeg;
+ }
+ }
+ if (rrr || c == EOF)
+ break;
+ if ((c = getc(inf)) == '\n' || c == EOF)
+ /* 2 in a row */
+ break;
+ *rr++ = '\n';
+ *rr++ = c;
+ }
+ } else {
+ for (rr = buf; ; ) {
+ for (; (c=getc(inf)) != sep && c != EOF; ) {
+ if (rr-buf+1 > bufsize)
+ if (!adjbuf(&buf, &bufsize, 1+rr-buf,
+ recsize, &rr, "readrec 1"))
+ FATAL("input record `%.30s...'"
+ " too long", buf);
+ *rr++ = c;
+ }
+ if (**RS == sep || c == EOF)
+ break;
+ if ((c = getc(inf)) == '\n' || c == EOF)
+ /* 2 in a row */
+ break;
+ if (!adjbuf(&buf, &bufsize, 2+rr-buf, recsize, &rr,
+ "readrec 2"))
+ FATAL("input record `%.30s...' too long", buf);
+ *rr++ = '\n';
*rr++ = c;
}
- if (**RS == sep || c == EOF)
- break;
- if ((c = getc(inf)) == '\n' || c == EOF) /* 2 in a row */
- break;
- if (!adjbuf(&buf, &bufsize, 2+rr-buf, recsize, &rr, "readrec 2"))
- FATAL("input record `%.30s...' too long", buf);
- *rr++ = '\n';
- *rr++ = c;
}
if (!adjbuf(&buf, &bufsize, 1+rr-buf, recsize, &rr, "readrec 3"))
FATAL("input record `%.30s...' too long", buf);
