Sat Jun 20 23:23:12 2009 UTC ()

PR/30294: John Darrow: nawk doesn't handle RS as a RE but as a single character


(christos)

diff -r1.16 -r1.17 src/dist/nawk/lib.c

--- src/dist/nawk/Attic/lib.c 2009/03/12 13:04:01	1.16
+++ src/dist/nawk/Attic/lib.c 2009/06/20 23:23:12	1.17

 @@ -200,42 +200,82 @@ int readrec(uschar **pbuf, int *pbufsize
 			free(inputFS);
 		inputFS = malloc(len + 1);
 		if (inputFS == NULL)
 			FATAL("field separator %.10s... is too long", *FS);
 		len_inputFS = len;
 		memcpy(inputFS, *FS, len + 1);
+	}
 	if ((sep = **RS) == 0) {
 		sep = '\n';
 		while ((c=getc(inf)) == '\n' && c != EOF)	/* skip leading \n's */
+			;
 		if (c != EOF)
 			ungetc(c, inf);
 	} else if ((*RS)[1]) {
-	for (rr = buf; ; ) {
+		fa *pfa = makedfa(*RS, 1);
-		for (; (c=getc(inf)) != sep && c != EOF; ) {
+		int tempstat = pfa->initstat;
-			if (rr-buf+1 > bufsize)
+		char *brr = buf;
-				if (!adjbuf(&buf, &bufsize, 1+rr-buf, recsize, &rr, "readrec 1"))
+		char *rrr = NULL;
-					FATAL("input record `%.30s...' too long", buf);
+		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);
 	*rr = 0;
 	   dprintf( ("readrec saw <%s>, returns %d\n", buf, c == EOF && rr == buf ? 0 : 1) );
 	*pbuf = buf;
 	*pbufsize = bufsize;
 	return c == EOF && rr == buf ? 0 : 1;
+}
 char *getargv(int n)	/* get ARGV[n] */
+{
 	Cell *x;