 @@ -1,15 +1,15 @@
 /*	$OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $	*/
-/*	$NetBSD: main.c,v 1.42 2012/04/25 18:23:58 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.43 2016/01/16 18:31:29 christos 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,29 +32,30 @@
  * 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.42 2012/04/25 18:23:58 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.43 2016/01/16 18:31:29 christos 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>
 #include "mdef.h"
 #include "stdd.h"
 #include "extern.h"
 @@ -72,26 +73,35 @@ int maxout;
 FILE *active;			/* active output file pointer  */
 int ilevel = 0; 		/* input file stack pointer    */
 int oindex = 0; 		/* diversion index..	       */
 const char *null = "";          /* as it says.. just a null..  */
 char **m4wraps = NULL;		/* m4wraps array.     	       */
 int maxwraps = 0;		/* size of m4wraps array       */
 int wrapindex = 0;		/* current offset in m4wraps   */
 char lquote[MAXCCHARS+1] = {LQUOTE};	/* left quote character  (`)   */
 char rquote[MAXCCHARS+1] = {RQUOTE};	/* right quote character (')   */
 char scommt[MAXCCHARS+1] = {SCOMMT};	/* start character for comment */
 char ecommt[MAXCCHARS+1] = {ECOMMT};	/* end character for comment   */
 int  synch_lines = 0;		/* line synchronisation for C preprocessor */
 int  prefix_builtins = 0;	/* -P option to prefix builtin keywords */
 int  fatal_warnings = 0;	/* -E option to exit on warnings */
 int  quiet = 0;			/* -Q option to silence warnings */
 int  nesting_limit = -1;	/* -L for nesting limit */
 const char *freeze = NULL;	/* -F to freeze state */
 const char *reload = NULL;	/* -R to reload state */
 #ifndef REAL_FREEZE
 FILE *freezef = NULL;
 int thawing = 0;
 #endif
 struct keyblk {
         const char *knam;	/* keyword name */
         int	ktyp;           /* keyword type */
 };
 struct keyblk keywrds[] = {	/* m4 keywords to be installed */
 	{ "include",      INCLTYPE },
 	{ "sinclude",     SINCTYPE },
 	{ "define",       DEFITYPE },
 	{ "defn",         DEFNTYPE },
 	{ "divert",       DIVRTYPE | NOARGS },
 	{ "expr",         EXPRTYPE },
 @@ -136,135 +146,225 @@ struct keyblk keywrds[] = {	/* m4 keywor
 	{ "traceoff",	  TRACEOFFTYPE | NOARGS },
 #if defined(unix) || defined(__unix__)
 	{ "unix",         SELFTYPE | NOARGS },
 #else
 #ifdef vms
 	{ "vms",          SELFTYPE | NOARGS },
 #endif
 #endif
 };
 #define MAXKEYS	(sizeof(keywrds)/sizeof(struct keyblk))
 extern int optind;
 extern char *optarg;
 #define MAXRECORD 50
 static struct position {
 	char *name;
 	unsigned long line;
 } quotes[MAXRECORD], paren[MAXRECORD];
 static void record(struct position *, int);
 static void dump_stack(struct position *, int);
 static void macro(void);
 static void initkwds(void);
 static ndptr inspect(int, char *);
 static int do_look_ahead(int, const char *);
 static void reallyoutputstr(const char *);
 static void reallyputchar(int);
 static void enlarge_stack(void);
 static void help(void);
-__dead static void
+static void
-usage(void)
+usage(FILE *f)
+{
-	fprintf(stderr, "usage: %s [-gPs] [-Dname[=value]] [-d flags] "
+	fprintf(f, "Usage: %s [-EGgiPQsv] [-Dname[=value]] [-d flags] "
-			"[-I dirname] [-o filename]\n"
+	    "[-I dirname] [-o filename] [-L limit]\n"
-			"\t[-t macro] [-Uname] [file ...]\n", getprogname());
+	    "\t[-t macro] [-Uname] [file ...]\n", getprogname());
 	exit(1);
+}
 __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' },
 	{ "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' },
 	{ "traditional",	no_argument,		0, 'G' },
 	{ "undefine",		required_argument,	0, 'U' },
 	{ "version",		no_argument,		0, 'v' },
 #ifdef notyet
 	{ "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;
 	char *p;
 	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(argc, argv, "gst:d:D:U:o:I:P")) != -1)
+	while ((c = getopt_long(argc, argv, "D:d:e:EF:GgIi:L: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':
 			if (freopen(optarg, "w+", stderr) == NULL)
 				err(EXIT_FAILURE, "Can't redirect errors to `%s'",
 				    optarg);
 			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 'P':
+		case 'i':
-			prefix_builtins = 1;
+			setvbuf(stdout, NULL, _IONBF, 0);
 			signal(SIGINT, SIG_IGN);
 			break;
-		case 'U':               /* undefine...       */
+		case 'G':
-			macro_popdef(optarg);
+			mimic_gnu = 0;
 			break;
 		case 'g':
 			mimic_gnu = 1;
 			break;
-		case 'd':
+		case 'L':
-			set_trace_flags(optarg);
+			nesting_limit = atoi(optarg);
 			break;
 		case 'o':
 			trace_file(optarg);
                         break;
 		case 'P':
 			prefix_builtins = 1;
 			break;
 		case 'Q':
 			quiet++;
 			break;
 		case 'R':
 			reload = optarg;
 			break;
 		case 's':
 			synch_lines = 1;
 			break;
 		case 't':
 			mark_traced(optarg, 1);
 			break;
-		case 'o':
+		case 'U':               /* undefine...       */
-			trace_file(optarg);
+			macro_popdef(optarg);
-                        break;
+			break;
 		case 'v':
 			fprintf(stderr, "%s version %d\n", getprogname(),
 			    VERSION);
 			return EXIT_SUCCESS;
 		case OPT_HELP:
 			help();
 			return EXIT_SUCCESS;
 		case '?':
-			usage();
+		default:
 			usage(stderr);
 			return EXIT_FAILURE;
+		}
 #ifdef REDIRECT
 	if (freopen("/tmp/m4", "w+", stderr) == NULL)
 		err(EXIT_FAILURE, "Can't redirect errors to `%s'",
 		    "/tmp/m4");
 #endif
         argc -= optind;
         argv += optind;
 	initkwds();
 	if (mimic_gnu)
 		setup_builtin("format", FORMATTYPE);
 	active = stdout;		/* default active output     */
 	bbase[0] = bufbase;
 	if (reload) {
 #ifdef REAL_FREEZE
 		thaw_state(reload);
 #else
 		if (fopen_trypath(infile, reload) == NULL)
 			err(1, "Can't open `%s'", reload);
 		sp = -1;
 		fp = 0;
 		thawing = 1;
 		macro();
 		thawing = 0;
 		release_input(infile);
 #endif
+	}
         if (!argc) {
  		sp = -1;		/* stack pointer initialized */
 		fp = 0; 		/* frame pointer initialized */
 		set_input(infile+0, stdin, "stdin");
 					/* default input (naturally) */
 		macro();
 	} else
 		for (; argc--; ++argv) {
 			p = *argv;
 			if (p[0] == '-' && p[1] == EOS)
 				set_input(infile, stdin, "stdin");
 			else if (fopen_trypath(infile, p) == NULL)
 				err(1, "%s", p);
 @@ -294,26 +394,34 @@ main(int argc, char *argv[])
+		}
+	}
 	if (active != stdout)
 		active = stdout;	/* reset output just in case */
 	for (n = 1; n < maxout; n++)	/* default wrap-up: undivert */
 		if (outfile[n] != NULL)
 			getdiv(n);
 					/* remove bitbucket if used  */
 	if (outfile[0] != NULL) {
 		(void) fclose(outfile[0]);
+	}
 #ifdef REAL_FREEZE
 	if (freeze)
 		freeze_state(freeze);
 #else
 	if (freezef)
 		fclose(freezef);
 #endif
 	return 0;
+}
 /*
  * Look ahead for `token'.
  * (on input `t == token[0]')
  * Used for comment and quoting delimiters.
  * Returns 1 if `token' present; copied to output.
  *         0 if `token' not found; all characters pushed back
  */
 static int
 do_look_ahead(int t, const char *token)
+{
 @@ -358,32 +466,36 @@ macro(void)
 			 * Opening quote: scan forward until matching
 			 * closing quote has been found.
 			 */
 			do {
 				l = gpbc();
 				if (LOOK_AHEAD(l,rquote)) {
 					if (--nlpar > 0)
 						outputstr(rquote);
 				} else if (LOOK_AHEAD(l,lquote)) {
 					record(quotes, nlpar++);
 					outputstr(lquote);
 				} else if (l == EOF) {
-					if (nlpar == 1)
+					if (!quiet) {
-						warnx("unclosed quote:");
+						if (nlpar == 1)
-					else
+							warnx("unclosed quote:");
-						warnx("%d unclosed quotes:", nlpar);
+						else
-					dump_stack(quotes, nlpar);
+							warnx(
-					exit(1);
+							    "%d unclosed quotes:",
 							    nlpar);
 						dump_stack(quotes, nlpar);
+					}
 					exit(EXIT_FAILURE);
 				} else {
 					if (nlpar > 0) {
 						if (sp < 0)
 							reallyputchar(l);
 						else
 							CHRSAVE(l);
+					}
+				}
+			}
 			while (nlpar != 0);
 		} else if (sp < 0 && LOOK_AHEAD(t, scommt)) {
 			reallyoutputstr(scommt);
 @@ -426,29 +538,32 @@ macro(void)
 					if ((size_t)sp == STACKMAX)
 						errx(1, "internal stack overflow");
 					eval((const char **) mstack+fp+1, 2,
 					    CALTYP, TRACESTATUS);
 					ep = PREVEP;	/* flush strspace */
 					sp = PREVSP;	/* previous sp..  */
 					fp = PREVFP;	/* rewind stack...*/
+				}
+			}
 		} else if (t == EOF) {
 			if (sp > -1 && ilevel <= 0) {
-				warnx( "unexpected end of input, unclosed parenthesis:");
+				if (!quiet) {
-				dump_stack(paren, PARLEV);
+					warnx("unexpected end of input, "
-				exit(1);
+					    "unclosed parenthesis:");
 					dump_stack(paren, PARLEV);
+				}
 				exit(EXIT_FAILURE);
+			}
 			if (ilevel <= 0)
 				break;			/* all done thanks.. */
 			release_input(infile+ilevel--);
 			emit_synchline();
 			bufbase = bbase[ilevel];
 			continue;
 		} else if (sp < 0) {		/* not in a macro at all */
 			reallyputchar(t);	/* output directly..	 */
+		}
 		else switch(t) {
 @@ -599,27 +714,27 @@ inspect(int c, char *tp)
  * initkwds - initialise m4 keywords as fast as possible.
  * This very similar to install, but without certain overheads,
  * such as calling lookup. Malloc is not used for storing the
  * keyword strings, since we simply use the static pointers
  * within keywrds block.
  */
 static void
 initkwds(void)
+{
 	unsigned int type;
 	size_t i;
 	for (i = 0; i < MAXKEYS; i++) {
-		type = keywrds[i].ktyp & TYPEMASK;
+		type = keywrds[i].ktyp;
 		if ((keywrds[i].ktyp & NOARGS) == 0)
 			type |= NEEDARGS;
 		setup_builtin(keywrds[i].knam, type);
+	}
+}
 static void
 record(struct position *t, int lev)
+{
 	if (lev < MAXRECORD) {
 		t[lev].name = CURRENT_NAME;
 		t[lev].line = CURRENT_LINE;
+	}
 @@ -642,13 +757,50 @@ dump_stack(struct position *t, int lev)
 static void
 enlarge_stack(void)
+{
 	STACKMAX += STACKMAX/2;
 	mstack = xrealloc(mstack, sizeof(stae) * STACKMAX,
 	    "Evaluation stack overflow (%lu)",
 	    (unsigned long)STACKMAX);
 	sstack = xrealloc(sstack, STACKMAX,
 	    "Evaluation stack overflow (%lu)",
 	    (unsigned long)STACKMAX);
+}
 static const struct {
 	const char *n;
 	const char *d;
 } nd [] = {
 { "-d, --debug[=flags]",	"set debug flags" },
 { "-D, --define=name[=value]",	"define macro" },
 { "-e, --error-output=file",	"send error output to file" },
 { "-E, --fatal-warnings",	"exit on warnings" },
 { "-F, --freeze-state=file",	"save state to file" },
 { "-g, --gnu",			"enable gnu extensions" },
 { "    --help",			"print this message and exit" },
 { "-I, --include=file",		"include file" },
 { "-i, --interactive",		"unbuffer output, ignore tty signals" },
 { "-L, --nesting-limit=num",	"macro expansion nesting limit (-1 disable)" },
 { "-P, --prefix-builtins",	"prefix builtins with m4_" },
 { "-Q, --quiet",		"don't print warnings" },
 { "-R, --reload-state=file",	"restore state from file" },
 { "-Q, --silent",		"don't print warnings" },
 { "-s, --synclines",		"output line directives for cpp(1)" },
 { "-t, --trace=macro",		"trace the named macro" },
 { "-G, --traditional",		"disable gnu extensions" },
 { "-U, --undefine=name",	"undefine the named macro" },
 { "-v, --version",		"print the version number and exit" },
 };
 static void
 help(void)
+{
 	size_t i;
 	fprintf(stdout, "%s version %d\n\n", getprogname(), VERSION);
 	usage(stdout);
 	fprintf(stdout, "\nThe long options are:\n");
 	for (i = 0; i < __arraycount(nd); i++)
 		fprintf(stdout, "\t%-25.25s\t%s\n", nd[i].n, nd[i].d);
+}

 @@ -1,15 +1,15 @@
 /*	$OpenBSD: mdef.h,v 1.29 2006/03/20 20:27:45 espie Exp $	*/
-/*	$NetBSD: mdef.h,v 1.16 2016/01/16 17:01:01 christos Exp $	*/
+/*	$NetBSD: mdef.h,v 1.17 2016/01/16 18:31:29 christos 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.
 @@ -223,13 +223,15 @@ struct input_file {
  *	|   .	|  PREVSP  |
  *	    .	   	   |
  *	+-------+	   |
  *	|	<----------+
  *	+-------+
+ *
  */
 #define PARLEV  (mstack[fp].sfra)
 #define CALTYP  (mstack[fp-2].sfra)
 #define TRACESTATUS (mstack[fp-1].sfra)
 #define PREVEP	(mstack[fp+3].sstr)
 #define PREVSP	(fp-4)
 #define PREVFP	(mstack[fp-3].sfra)
 #define VERSION	20150116