 @@ -1,15 +1,15 @@
 /*	$OpenBSD: extern.h,v 1.49 2009/10/14 17:19:47 sthen Exp $	*/
-/*	$NetBSD: extern.h,v 1.19 2016/01/16 18:30:57 christos Exp $	*/
+/*	$NetBSD: extern.h,v 1.19.18.1 2020/07/07 10:40:46 martin Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ozan Yigit at York University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -136,27 +136,27 @@ extern void	release_input(struct input_f
 			enlarge_strspace();	\
 		*ep++ = (c);			\
 	} while(0)
 /* and corresponding exposure for local symbols */
 extern void enlarge_bufspace(void);
 extern void enlarge_strspace(void);
 extern unsigned char *endpbb;
 extern char *endest;
 /* trace.c */
 extern unsigned int trace_flags;
 #define TRACE_ALL	512
-extern void trace_file(const char *);
+extern int trace_file(const char *);
 extern size_t trace(const char **, int, struct input_file *);
 extern void finish_trace(size_t);
 extern void set_trace_flags(const char *);
 extern FILE *traceout;
 extern ndptr hashtab[];		/* hash table for macros etc. */
 extern stae *mstack;		/* stack of m4 machine */
 extern char *sstack;		/* shadow stack, for string space extension */
 extern FILE *active;		/* active output file pointer */
 extern struct input_file infile[];/* input file stack (0=stdin) */
 extern FILE **outfile;		/* diversion array(0=bitbucket) */
 extern int maxout;		/* maximum number of diversions */
 extern int fp; 			/* m4 call frame pointer */

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: m4.1,v 1.27 2016/01/17 11:24:28 wiz Exp $
+.\"	$NetBSD: m4.1,v 1.27.18.1 2020/07/07 10:40:46 martin Exp $
 .\"	@(#) $OpenBSD: m4.1,v 1.56 2009/10/14 17:19:47 sthen Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Ozan Yigit at York University.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 @@ -21,42 +21,41 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 16, 2015
+.Dd June 25, 2020
 .Dt M4 1
 .Os
 .Sh NAME
 .Nm m4
 .Nd macro language processor
 .Sh SYNOPSIS
 .Nm m4
 .Op Fl EGgiPQsv
 .Oo
 .Sm off
 .Fl D Ar name Op No = Ar value
 .Sm on
 .Oc
 .Op Fl d Ar flags
 .Op Fl e Ar filename
 .Op Fl F Ar filename
 .Op Fl I Ar dirname
 .Op Fl L Ar number
 .Op Fl o Ar filename
 .Op Fl R Ar filename
 .Op Fl t Ar macro
 .Op Fl U Ns Ar name
 .Op Ar
 .Sh DESCRIPTION
 The
 .Nm m4
 utility is a macro processor that can be used as a front end to any
 language (e.g., C, ratfor, fortran, lex, and yacc).
 @@ -128,55 +127,53 @@ quote arguments and expansion with the c
 start with all macros traced.
 .It Ar x
 number macro expansions.
 .It Ar V
 turn on all options.
 .El
 .Pp
 By default, trace is set to
 .Qq eq .
 .It Fl E , Fl Fl fatal-warnings
 Warnings make
 .Nm
 exit.
 .It Fl e , Fl Fl error-output Ar filename
 Redirect error output to filename.
 .It Fl F , Fl Fl freeze-state Ar filename
 Save the input state to
 .Ar filename .
 .It Fl G , Fl Fl traditional
 Disable GNU-m4 extensions.
 .It Fl g , Fl Fl gnu
 Activate GNU-m4 compatibility mode.
 In this mode, translit handles simple character
 ranges (e.g., a-z), regular expressions mimic emacs behavior,
 multiple m4wrap calls are handled as a stack,
 the number of diversions is unlimited,
 empty names for macro definitions are allowed,
 and eval understands
 .Sq 0rbase:value
 numbers.
 .It Fl Fl help
 Print help message and exit.
 .It Fl I , Fl Fl include Ar "dirname"
 Add directory
 .Ar dirname
 to the include path.
 .It Fl i , Fl Fl interactive
 Set unbuffered output, disable tty signals.
 .It Fl L , Fl Fl nesting-limit
 Set the nesting limit in macro expansions.
 This is unimplemented and unlimited.
-.It Fl o Ar filename
+.It Fl o , Fl Fl error-output Ar filename
 Send trace output to
 .Ar filename .
 .It Fl P , Fl Fl prefix-builtins
 Prefix all built-in macros with
 .Sq m4_ .
 For example, instead of writing
 .Ic define ,
 use
 .Ic m4_define .
 .It Fl Q , Fl Fl quiet , Fl Fl silent
 Don't print warnings.
 .It Fl R , Fl Fl reload-state Ar filename
 Reload a previously saved state from

 @@ -1,15 +1,15 @@
 /*	$OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $	*/
-/*	$NetBSD: main.c,v 1.48 2019/03/26 16:41:06 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.48.2.1 2020/07/07 10:40:46 martin Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ozan Yigit at York University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * main.c
  * Facility: m4 macro processor
  * by: oz
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.48 2019/03/26 16:41:06 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.48.2.1 2020/07/07 10:40:46 martin Exp $");
 #include <assert.h>
 #include <signal.h>
 #include <getopt.h>
 #include <err.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <ohash.h>
 @@ -186,27 +186,27 @@ usage(FILE *f)
 __dead static void
 onintr(int signo)
+{
 	char intrmessage[] = "m4: interrupted.\n";
 	write(STDERR_FILENO, intrmessage, sizeof(intrmessage)-1);
 	_exit(1);
+}
 #define OPT_HELP 1
 struct option longopts[] = {
 	{ "debug",		optional_argument,	0, 'd' },
 	{ "define",		required_argument,	0, 'D' },
-	{ "error-output",	required_argument,	0, 'e' },
+	{ "error-output",	required_argument,	0, 'o' }, /* sic */
 	{ "fatal-warnings",	no_argument,		0, 'E' },
 	{ "freeze-state",	required_argument,	0, 'F' },
 	{ "gnu",		no_argument,		0, 'g' },
 	{ "help",		no_argument,		0, OPT_HELP },
 	{ "include",		required_argument,	0, 'I' },
 	{ "interactive",	no_argument,		0, 'i' },
 	{ "nesting-limit",	required_argument,	0, 'L' },
 	{ "prefix-builtins",	no_argument,		0, 'P' },
 	{ "quiet",		no_argument,		0, 'Q' },
 	{ "reload-state",	required_argument,	0, 'R' },
 	{ "silent",		no_argument,		0, 'Q' },
 	{ "synclines",		no_argument,		0, 's' },
 	{ "trace",		required_argument,	0, 't' },
 @@ -217,99 +217,89 @@ struct option longopts[] = {
 	{ "arglength",		required_argument,	0, 'l' },
 	{ "debugfile",		optional_argument, 	0, OPT_DEBUGFILE },
 	{ "hashsize",		required_argument,	0, 'H' },
 	{ "warn-macro-sequence",optional_argument,	0, OPT_WARN_SEQUENCE },
 #endif
 	{ 0,			0,			0, 0 },
 };
 int
 main(int argc, char *argv[])
+{
 	int c;
 	int n;
 	int error;
 	char *p;
 	FILE *sfp;
 	setprogname(argv[0]);
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
 		signal(SIGINT, onintr);
 	init_macros();
 	initspaces();
 	STACKMAX = INITSTACKMAX;
 	mstack = (stae *)xalloc(sizeof(stae) * STACKMAX, NULL);
 	sstack = (char *)xalloc(STACKMAX, NULL);
 	maxout = 0;
 	outfile = NULL;
 	resizedivs(MAXOUT);
-	while ((c = getopt_long(argc, argv, "D:d:e:EF:GgI:iL:o:PR:Qst:U:v",
+	while ((c = getopt_long(argc, argv, "D:d:EF:GgI:iL:o:PR:Qst:U:v",
 	    longopts, NULL)) != -1)
 		switch(c) {
 		case 'D':               /* define something..*/
 			for (p = optarg; *p; p++)
 				if (*p == '=')
 					break;
 			if (*p)
 				*p++ = EOS;
 			dodefine(optarg, p);
 			break;
 		case 'd':
 			set_trace_flags(optarg);
 			break;
 		case 'E':
 			fatal_warnings++;
 			break;
 		case 'e':
 			/*
 			 * Don't use freopen here because if it fails
 			 * we lose stderr, instead trash it.
 			 */
 			if ((sfp = fopen(optarg, "w+")) == NULL) {
 				warn("Can't redirect errors to `%s'", optarg);
 				break;
 			fclose(stderr);
 			memcpy(stderr, sfp, sizeof(*sfp));
 			break;
 		case 'F':
 			freeze = optarg;
 #ifndef REAL_FREEZE
 			if ((freezef = fopen(freeze, "w")) == NULL)
 				err(EXIT_FAILURE, "Can't open `%s'", freeze);
 #endif
 			break;
 		case 'I':
 			addtoincludepath(optarg);
 			break;
 		case 'i':
 			setvbuf(stdout, NULL, _IONBF, 0);
 			signal(SIGINT, SIG_IGN);
 			break;
 		case 'G':
 			mimic_gnu = 0;
 			break;
 		case 'g':
 			mimic_gnu = 1;
 			break;
 		case 'L':
 			nesting_limit = atoi(optarg);
 			break;
 		case 'o':
-			trace_file(optarg);
+			error = trace_file(optarg);
 			if (error)
 				warn("%s", optarg);
                         break;
 		case 'P':
 			prefix_builtins = 1;
 			break;
 		case 'Q':
 			quiet++;
 			break;
 		case 'R':
 			reload = optarg;
 			break;
 		case 's':
 			synch_lines = 1;
 			break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trace.c,v 1.8 2012/03/20 20:34:58 matt Exp $	*/
+/*	$NetBSD: trace.c,v 1.8.34.1 2020/07/07 10:40:46 martin Exp $	*/
 /* $OpenBSD: trace.c,v 1.15 2006/03/24 08:03:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -18,27 +18,27 @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENBSD
  * PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: trace.c,v 1.8 2012/03/20 20:34:58 matt Exp $");
+__RCSID("$NetBSD: trace.c,v 1.8.34.1 2020/07/07 10:40:46 martin Exp $");
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "mdef.h"
 #include "stdd.h"
 #include "extern.h"
 FILE *traceout;
 @@ -49,35 +49,47 @@ FILE *traceout;
 #define TRACE_LINENO	16
 #define TRACE_CONT	32
 #define TRACE_ID	64
 #define TRACE_NEWFILE	128	/* not implemented yet */
 #define TRACE_INPUT	256	/* not implemented yet */
 static unsigned int letter_to_flag(int);
 static void print_header(struct input_file *);
 static int frame_level(void);
 unsigned int trace_flags = TRACE_QUOTE | TRACE_EXPANSION;
-void
+int
 trace_file(const char *name)
+{
 	FILE *newfp;
 	if (name == NULL)
 		newfp = stderr;
 #if 0 /* not yet */
 	else if (*name == '\0')
 		newfp = NULL;
 #endif
 	else {
 		newfp = fopen(name, "a");
 		if (newfp == NULL)
 			return -1;
+	}
 	if (traceout && traceout != stderr)
 		fclose(traceout);
-	traceout = fopen(name, "w");
+	traceout = newfp;
-	if (!traceout)
+	return 0;
 		err(1, "can't open %s", name);
+}
 static unsigned int
 letter_to_flag(int c)
+{
 	switch(c) {
 	case 'a':
 		return TRACE_ARGS;
 	case 'e':
 		return TRACE_EXPANSION;
 	case 'q':
 		return TRACE_QUOTE;
 	case 'c':