shithub: trueawk

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,9 @@

+2018-08-29         Arnold D. Robbins     <arnold@skeeve.com>

+	* REGRESS: Check for existence of a.out. If not there, run

+	make.  Enable core dumps for T.arnold system status test

+	to work on MacOS X.

 2018-08-22         Arnold D. Robbins     <arnold@skeeve.com>

 	* awktest.tar (testdir/T.expr): Fix test for unary plus.

--- a/FIXES

+++ b/FIXES

@@ -25,6 +25,11 @@

 This file lists all bug fixes, changes, etc., made since the AWK book

 was sent to the printers in August, 1987.

+Oct 25, 2018:

+	Added test in maketab.c to prevent generating a proctab entry

+	for YYSTYPE_IS_DEFINED.  It was harmless but some gcc settings

+	generated a warning message.  Thanks to Nan Xiao for report.

 Aug 27, 2018:

 	Disallow '$' in printf formats; arguments evaluated in order

 	and printed in order.

--- a/REGRESS

+++ b/REGRESS

@@ -1,5 +1,15 @@

 #! /bin/sh

+case `uname` in

+CYGWIN)	EXE=a.exe ;;

+*)	EXE=a.out ;;

+esac

+if [ ! -f $EXE ]

+then

+	make || exit 1

+fi

 if [ -d testdir ]

 then

 	true	# do nothing

@@ -16,5 +26,10 @@

pwd

 PATH=.:$PATH

 export PATH

+if (ulimit -c unlimited > /dev/null 2>&1)

+then

+	# Workaround broken default on MacOS X

+	ulimit -c unlimited

+fi

 REGRESS

--- a/bugs-fixed/README

+++ b/bugs-fixed/README

@@ -24,7 +24,16 @@

 7. unary-plus: Unary plus on a string constant returned the string.

 Instead, it should convert the value to numeric and give that value.

+8. missing-precision: When using the format string "%*s", the precision

+argument was used without checking if it was present first.

+9. fmt-overflow: The buffer used for OFMT/CONVFMT conversions was written

+to with sprintf(), which meant that some conversions could write past the

+end.

 X. split-fs-from-array: If the third argument to split() comes from the

 array passed as the second argument, then split() would previously read

 from the freed memory and possibly produce incorrect results (depending

 on the system's malloc()/free() behaviour.)

--- /dev/null

+++ b/bugs-fixed/fmt-overflow.awk

@@ -1,0 +1,1 @@

+BEGIN { OFMT = "%.1000f"; print 1.25; }

--- /dev/null

+++ b/bugs-fixed/fmt-overflow.ok

@@ -1,0 +1,1 @@

+1.2500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

--- /dev/null

+++ b/bugs-fixed/missing-precision.awk

@@ -1,0 +1,1 @@

+BEGIN { printf("%*s"); }

--- /dev/null

+++ b/bugs-fixed/missing-precision.ok

@@ -1,0 +1,2 @@

+./a.out: not enough args in printf(%*s)

+ source line number 1

--- a/lex.c

+++ b/lex.c

@@ -198,6 +198,7 @@

 		yylval.i = c;

 		switch (c) {

 		case '\n':	/* {EOL} */

+			lineno++;

 			RET(NL);

 		case '\r':	/* assume \n is coming */

 		case ' ':	/* {WS}+ */

@@ -213,6 +214,7 @@

 		case '\\':

 			if (peek() == '\n') {

 				input();

+				lineno++;

 			} else if (peek() == '\r') {

 				input(); input();	/* \n */

 				lineno++;

@@ -370,10 +372,11 @@

 		case '\n':

 		case '\r':

 		case 0:

+			*bp = '\0';

 			SYNTAX( "non-terminated string %.10s...", buf );

-			lineno++;

 			if (c == 0)	/* hopeless */

 				FATAL( "giving up" );

+			lineno++;

 			break;

 		case '\\':

 			c = input();

@@ -515,6 +518,7 @@

 		if (!adjbuf(&buf, &bufsz, bp-buf+3, 500, &bp, "regexpr"))

 			FATAL("out of space for reg expr %.10s...", buf);

 		if (c == '\n') {

+			*bp = '\0';

 			SYNTAX( "newline in regular expression %.10s...", buf );

 			unput('\n');

 			break;

@@ -553,19 +557,19 @@

 			lexprog++;

 	} else				/* awk -f ... */

 		c = pgetc();

-	if (c == '\n')

-		lineno++;

-	else if (c == EOF)

+	if (c == EOF)

 		c = 0;

 	if (ep >= ebuf + sizeof ebuf)

 		ep = ebuf;

-	return *ep++ = c;

+	*ep = c;

+	if (c != 0) {

+		ep++;

+	}

+	return (c);

 void unput(int c)	/* put lexical character back on input */

-	if (c == '\n')

-		lineno--;

 	if (yysptr >= yysbuf + sizeof(yysbuf))

 		FATAL("pushed back too much: %.20s...", yysbuf);

 	*yysptr++ = c;

--- a/makefile

+++ b/makefile

@@ -34,8 +34,8 @@

 # yacc options.  pick one; this varies a lot by system.

 #YFLAGS = -d -S

-#YACC = bison -d -y

-YACC = yacc -d

+YACC = bison -d -y

+#YACC = yacc -d

 #		-S uses sprintf in yacc parser instead of sprint

 OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o

--- a/maketab.c

+++ b/maketab.c

@@ -135,6 +135,8 @@

 		n = sscanf(buf, "%1c %s %s %d", &c, def, name, &tok);

 		if (c != '#' || (n != 4 && strcmp(def,"define") != 0))	/* not a valid #define */

 			continue;

+		if (strcmp(name, "YYSTYPE_IS_DECLARED") == 0)

+			continue;

 		if (tok < FIRSTTOKEN || tok > LASTTOKEN) {

 			/* fprintf(stderr, "maketab funny token %d %s ignored\n", tok, buf); */

 			continue;

--- a/run.c

+++ b/run.c

@@ -863,6 +863,9 @@

 				FATAL("'$' not permitted in awk formats");

 			if (*s == '*') {

+				if (a == NULL) {

+					FATAL("not enough args in printf(%s)", os);

+				}

 				x = execute(a);

 				a = a->nnext;

 				sprintf(t-1, "%d", fmtwd=(int) getfval(x));

--- a/tran.c

+++ b/tran.c

@@ -395,7 +395,7 @@

 static char *get_str_val(Cell *vp, char **fmt)        /* get string val of a Cell */

-	char s[100];	/* BUG: unchecked */

+	char s[256];

 	double dtemp;

 	if ((vp->tval & (NUM | STR)) == 0)

@@ -434,9 +434,9 @@

 		if (freeable(vp)) \

 			xfree(vp->sval); \

 		if (modf(vp->fval, &dtemp) == 0)	/* it's integral */ \

-			sprintf(s, "%.30g", vp->fval); \

+			snprintf(s, sizeof (s), "%.30g", vp->fval); \

 		else \

-			sprintf(s, *fmt, vp->fval); \

+			snprintf(s, sizeof (s), *fmt, vp->fval); \

 		vp->sval = tostring(s); \

 		vp->tval &= ~DONTFREE; \

 		vp->tval |= STR; \

--

⑨