Upstream 6.2

Author: dimkr

Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2013/08/18 22:06:44 miod Exp $
+#	$OpenBSD: Makefile,v 1.16 2017/07/10 21:30:37 espie Exp $
 
 PROG=	awk
 SRCS=	ytab.c lex.c b.c main.c parse.c proctab.c tran.c lib.c run.c
@@ -9,9 +9,9 @@ CFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 HOSTCFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 
 ytab.c ytab.h: awkgram.y
-	${YACC} -d ${.CURDIR}/awkgram.y
-	mv y.tab.c ytab.c
-	mv y.tab.h ytab.h
+	${YACC} -o ytab.c -d ${.CURDIR}/awkgram.y
+
+BUILDFIRST = ytab.h
 
 proctab.c: maketab
 	./maketab >proctab.c

lib.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib.c,v 1.22 2016/04/12 19:43:38 millert Exp $	*/
+/*	$OpenBSD: lib.c,v 1.23 2017/09/25 17:36:35 krw Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -592,7 +592,7 @@ void bcheck2(int n, int c1, int c2)
 		fprintf(stderr, "\t%d extra %c's\n", -n, c2);
 }
 
-void FATAL(const char *fmt, ...)
+__dead void FATAL(const char *fmt, ...)
 {
 	extern char *cmdname;
 	va_list varg;

proto.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.h,v 1.9 2011/09/28 19:27:18 millert Exp $	*/
+/*	$OpenBSD: proto.h,v 1.10 2017/09/25 17:36:35 krw Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -133,7 +133,7 @@ extern	void	fpecatch(int);
 extern	void	bracecheck(void);
 extern	void	bcheck2(int, int, int);
 extern	void	SYNTAX(const char *, ...);
-extern	void	FATAL(const char *, ...);
+extern	__dead void	FATAL(const char *, ...);
 extern	void	WARNING(const char *, ...);
 extern	void	error(void);
 extern	void	eprint(void);

run.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.40 2015/12/16 19:44:42 tb Exp $	*/
+/*	$OpenBSD: run.c,v 1.41 2017/09/15 14:19:56 ajacoutot Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -1545,7 +1545,7 @@ Cell *bltin(Node **a, int n)	/* builtin functions. a[0] is type, a[1] is arg lis
 		break;
 	case FXOR:
 		if (nextarg == 0) {
-			WARNING("or requires two arguments; returning 0");
+			WARNING("xor requires two arguments; returning 0");
 			u = 0;
 			break;
 		}
@@ -1556,7 +1556,7 @@ Cell *bltin(Node **a, int n)	/* builtin functions. a[0] is type, a[1] is arg lis
 		break;
 	case FLSHIFT:
 		if (nextarg == 0) {
-			WARNING("or requires two arguments; returning 0");
+			WARNING("lshift requires two arguments; returning 0");
 			u = 0;
 			break;
 		}
@@ -1567,7 +1567,7 @@ Cell *bltin(Node **a, int n)	/* builtin functions. a[0] is type, a[1] is arg lis
 		break;
 	case FRSHIFT:
 		if (nextarg == 0) {
-			WARNING("or requires two arguments; returning 0");
+			WARNING("rshift requires two arguments; returning 0");
 			u = 0;
 			break;
 		}