 @@ -1,34 +1,30 @@
-/*	$NetBSD: defs.h,v 1.8 2003/10/27 00:12:43 lukem Exp $	 */
+/*	$NetBSD: defs.h,v 1.9 2012/03/06 16:55:18 mbalmer Exp $	 */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,34 +1,30 @@
-/*	$NetBSD: mdb.h,v 1.8 2006/02/20 21:06:40 dsl Exp $	*/
+/*	$NetBSD: mdb.h,v 1.9 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,124 +1,115 @@
-/*	$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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.
+ *
  */
 /* main.c - main program for menu compiler. */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2012/03/06 16:55:18 mbalmer Exp $");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #define MAIN
 #include "defs.h"
 /* Local prototypes */
-void usage (char *);
+__dead void usage(void);
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
+{
 	int ch;
 	prog_name = argv[0];
 	/* Process the arguments. */
-	while ( (ch = getopt (argc, argv, "o:")) != -1 ) {
+	while ((ch = getopt(argc, argv, "o:")) != -1 ) {
 		switch (ch) {
 		case 'o': /* output file name */
 			out_name = optarg;
 			break;
 		default:
-			usage (prog_name);
+			usage();
+		}
+	}
-	if (optind != argc-1)
+	if (optind != argc - 1)
-		usage (prog_name);
+		usage();
 	src_name = argv[optind];
-	yyin = fopen (src_name, "r");
+	yyin = fopen(src_name, "r");
 	if (yyin == NULL) {
-		(void) fprintf (stderr, "%s: could not open %s.\n",
+		(void)fprintf(stderr, "%s: could not open %s.\n", prog_name,
-				prog_name, src_name);
+		    src_name);
-		exit (1);
+		exit(1);
+	}
 	/* The default menu */
 	default_menu.info = &default_info;
 	default_info.title = "\"\"";
 	default_info.helpstr = NULL;
 	default_info.exitstr = NULL;
 	default_info.mopt = 0;
 	default_info.x = -1;
 	default_info.y = 0;
 	default_info.h = 0;
 	default_info.w = 0;
 	default_info.numopt = 0;
 	default_info.optns = NULL;
 	default_info.postact.code = NULL;
 	default_info.postact.endwin = FALSE;
 	default_info.exitact.code = NULL;
 	default_info.exitact.endwin = FALSE;
 	/* Do the parse */
-	(void) yyparse ();
+	(void)yyparse();
-	if (had_errors)
+	return had_errors ? 1 : 0;
 		return 1;
 	return 0;
+}
-void
+__dead void
-usage (char *prog)
+usage(void)
+{
-	(void) fprintf (stderr, "%s [-o name] file\n", prog);
+	(void)fprintf (stderr, "%s [-o name] file\n", getprogname());
-	exit (1);
+	exit(1);
+}

 @@ -1,176 +1,162 @@
-/*	$NetBSD: mdb.c,v 1.45 2011/09/06 18:16:38 joerg Exp $	*/
+/*	$NetBSD: mdb.c,v 1.46 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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.
+ *
  */
 /* mdb.c - menu database manipulation */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mdb.c,v 1.45 2011/09/06 18:16:38 joerg Exp $");
+__RCSID("$NetBSD: mdb.c,v 1.46 2012/03/06 16:55:18 mbalmer Exp $");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mdb.h"
 #include "defs.h"
 #include "pathnames.h"
 /* Data */
 #undef MAX
 #define MAX 1000
 static int menu_no = 0;
 static id_rec *menus[MAX];
 /* Other defines */
 #define OPT_SUB		1
 #define OPT_ENDWIN	2
 #define OPT_EXIT	4
 /* get_menu returns a pointer to a newly created id_rec or an old one. */
 id_rec *
-get_menu (char *name)
+get_menu(char *name)
+{
 	id_rec *temp;
 	temp = find_id (root, name);
 	if (temp == NULL) {
 		if (menu_no < MAX) {
-			temp = (id_rec *) malloc (sizeof(id_rec));
+			temp = (id_rec *)malloc(sizeof(id_rec));
 			temp->id = strdup(name);
 			temp->info = NULL;
 			temp->menu_no = menu_no;
 			menus[menu_no++] = temp;
-			insert_id (&root, temp);
+			insert_id(&root, temp);
 		} else {
-			(void) fprintf (stderr, "Too many menus.  "
+			(void)fprintf(stderr, "Too many menus.  "
-					"Increase MAX.\n");
+			    "Increase MAX.\n");
 			exit(1);
+		}
+	}
 	return temp;
+}
 /* Verify that all menus are defined. */
 void
-check_defined (void)
+check_defined(void)
+{
 	int i;
-	for (i=0; i<menu_no; i++)
+	for (i = 0; i < menu_no; i++)
 		if (!menus[i]->info)
 			yyerror ("Menu '%s' undefined.", menus[i]->id);
+}
 /* Write out the menu file. */
 void
-write_menu_file (char *initcode)
+write_menu_file(char *initcode)
+{
-	FILE *out_file;
+	FILE *out_file, *sys_file;
 	FILE *sys_file;
 	int i, j;
-	char hname[1024];
+	char hname[1024], cname[1024], sname[1024];
-	char cname[1024];
+	char *sys_prefix, *tmpstr;
-	char sname[1024];
+	int name_is_code, nlen, ch;
 	char *sys_prefix;
 	char *tmpstr;
 	int name_is_code;
 	int nlen;
 	int ch;
 	optn_info *toptn;
 	/* Generate file names */
-	snprintf (hname, 1024, "%s.h", out_name);
+	snprintf(hname, 1024, "%s.h", out_name);
 	nlen = strlen(hname);
 	if (hname[nlen-2] != '.' || hname[nlen-1] != 'h') {
-		(void) fprintf (stderr, "%s: name `%s` too long.\n",
+		(void)fprintf(stderr, "%s: name `%s` too long.\n",
-				prog_name, out_name);
+		    prog_name, out_name);
 		exit(1);
+	}
-	snprintf (cname, 1024, "%s.c", out_name);
+	snprintf(cname, 1024, "%s.c", out_name);
 	/* Open the menu_sys file first. */
-	sys_prefix = getenv ("MENUDEF");
+	sys_prefix = getenv("MENUDEF");
 	if (sys_prefix == NULL)
 		sys_prefix = _PATH_DEFSYSPREFIX;
-	snprintf (sname, 1024, "%s/%s", sys_prefix, sys_name);
+	snprintf(sname, 1024, "%s/%s", sys_prefix, sys_name);
 	sys_file = fopen (sname, "r");
 	if (sys_file == NULL) {
-		(void) fprintf (stderr, "%s: could not open %s.\n",
+		(void)fprintf(stderr, "%s: could not open %s.\n",
-				prog_name, sname);
+		    prog_name, sname);
-		exit (1);
+		exit(1);
+	}
 	/* Output the .h file first. */
-	out_file = fopen (hname, "w");
+	out_file = fopen(hname, "w");
 	if (out_file == NULL) {
-		(void) fprintf (stderr, "%s: could not open %s.\n",
+		(void)fprintf(stderr, "%s: could not open %s.\n",
-				prog_name, hname);
+		    prog_name, hname);
-		exit (1);
+		exit(1);
+	}
 	/* Write it */
-	(void) fprintf (out_file, "%s",
+	(void)fprintf(out_file, "%s",
 		"/* menu system definitions. */\n"
 		"\n"
 		"#ifndef MENU_DEFS_H\n"
 		"#define MENU_DEFS_H\n"
 		"#include <stdlib.h>\n"
 		"#include <string.h>\n"
 		"#include <ctype.h>\n"
 		"#include <curses.h>\n\n"
 		);
 	if (do_msgxlat)
 		(void)fprintf(out_file, "#define MSG_XLAT(x) msg_string(x)\n");
 	else
 @@ -218,237 +204,228 @@ write_menu_file (char *initcode)
 		MC_OPT(MC_NOEXITOPT)
 		MC_OPT(MC_NOBOX)
 		MC_OPT(MC_SCROLL)
 		MC_OPT(MC_NOSHORTCUT)
 		MC_OPT(MC_NOCLEAR)
 		MC_OPT(MC_DFLTEXIT)
 		MC_OPT(MC_ALWAYS_SCROLL)
 		MC_OPT(MC_SUBMENU)
 		MC_OPT(MC_VALID)
 #undef MC_OPT
 #undef STR
 	);
-	(void) fprintf (out_file, "%s",
+	(void)fprintf(out_file, "%s",
 		"\n"
 		"/* Prototypes */\n"
 		"int menu_init(void);\n"
 		"void process_menu(int, void *);\n"
 		"__dead void __menu_initerror(void);\n"
 		);
 	if (do_dynamic)
-		(void) fprintf (out_file, "%s",
+		(void)fprintf(out_file, "%s",
 			"int new_menu(const char *, menu_ent *, int, \n"
 			    "\tint, int, int, int, int,\n"
 			    "\tvoid (*)(menudesc *, void *), "
 			    "void (*)(menudesc *, int, void *),\n"
 			    "\tvoid (*)(menudesc *, void *), "
 			    "const char *, const char *);\n"
 			"void free_menu(int);\n"
 			"void set_menu_numopts(int, int);\n"
 			);
-	(void) fprintf (out_file, "\n/* Menu names */\n");
+	(void)fprintf(out_file, "\n/* Menu names */\n");
-	for (i=0; i<menu_no; i++) {
+	for (i = 0; i < menu_no; i++)
-		(void) fprintf (out_file, "#define MENU_%s\t%d\n",
+		(void)fprintf(out_file, "#define MENU_%s\t%d\n",
-				menus[i]->id, i);
+		    menus[i]->id, i);
 	if (do_dynamic)
-		(void) fprintf (out_file, "\n#define DYN_MENU_START\t%d",
+		(void)fprintf(out_file, "\n#define DYN_MENU_START\t%d",
-				menu_no);
+		    menu_no);
-	(void) fprintf (out_file, "\n#define MAX_STRLEN %d\n"
+	(void)fprintf (out_file, "\n#define MAX_STRLEN %d\n"
-			"#endif\n", max_strlen);
+	    "#endif\n", max_strlen);
-	fclose (out_file);
+	fclose(out_file);
 	/* Now the C file */
-	out_file = fopen (cname, "w");
+	out_file = fopen(cname, "w");
 	if (out_file == NULL) {
-		(void) fprintf (stderr, "%s: could not open %s.\n",
+		(void)fprintf(stderr, "%s: could not open %s.\n",
-				prog_name, cname);
+		    prog_name, cname);
-		exit (1);
+		exit(1);
+	}
 	/* initial code */
-	fprintf (out_file, "#include \"%s\"\n\n", hname);
+	fprintf(out_file, "#include \"%s\"\n\n", hname);
-	fprintf (out_file, "%s\n\n", initcode);
+	fprintf(out_file, "%s\n\n", initcode);
 	/* data definitions */
 	/* func defs */
-	for (i=0; i<menu_no; i++) {
+	for (i = 0; i < menu_no; i++) {
 		if (strlen(menus[i]->info->postact.code)) {
-			(void) fprintf (out_file,
+			(void)fprintf(out_file, "/*ARGSUSED*/\n"
-				"/*ARGSUSED*/\n"
+			    "static void menu_%d_postact(menudesc *menu, void *arg)\n{\n", i);
 				"static void menu_%d_postact(menudesc *menu, void *arg)\n{\n", i);
 			if (menus[i]->info->postact.endwin)
-				(void) fprintf (out_file, "\tendwin();\n");
+				(void)fprintf(out_file, "\tendwin();\n");
-			(void) fprintf (out_file,
+			(void)fprintf(out_file, "\t%s\n}\n\n",
-					"\t%s\n}\n\n",
+			    menus[i]->info->postact.code);
 					menus[i]->info->postact.code);
+		}
 		if (strlen(menus[i]->info->exitact.code)) {
-			(void) fprintf (out_file,
+			(void)fprintf(out_file, "/*ARGSUSED*/\n"
-				"/*ARGSUSED*/\n"
+			    "static void menu_%d_exitact(menudesc *menu, void *arg)\n{\n", i);
 				"static void menu_%d_exitact(menudesc *menu, void *arg)\n{\n", i);
 			if (menus[i]->info->exitact.endwin)
-				(void) fprintf (out_file, "\tendwin();\n");
+				(void)fprintf(out_file, "\tendwin();\n");
-			(void) fprintf (out_file, "\t%s\n}\n\n",
+			(void)fprintf(out_file, "\t%s\n}\n\n",
-					menus[i]->info->exitact.code);
+			    menus[i]->info->exitact.code);
+		}
 		j = 0;
 		toptn = menus[i]->info->optns;
-		for (;toptn != NULL; j++, toptn = toptn->next) {
+		for (; toptn != NULL; j++, toptn = toptn->next) {
 			if (strlen(toptn->optact.code) == 0)
 				continue;
-			(void) fprintf (out_file,
+			(void)fprintf(out_file, "/*ARGSUSED*/\n"
-				"/*ARGSUSED*/\n"
+			    "static int opt_act_%d_%d(menudesc *m, void *arg)\n"
-				"static int opt_act_%d_%d(menudesc *m, void *arg)\n"
+			    "{\n\t%s\n\treturn %s;\n}\n\n",
-				"{\n\t%s\n\treturn %s;\n}\n\n",
+			    i, j, toptn->optact.code,
-				i, j, toptn->optact.code,
+			    (toptn->doexit ? "1" : "0"));
 				(toptn->doexit ? "1" : "0"));
+		}
+	}
 	/* optentX */
-	for (i=0; i<menu_no; i++) {
+	for (i = 0; i < menu_no; i++) {
 		if (menus[i]->info->numopt > 53) {
-			(void) fprintf (stderr, "Menu %s has "
+			(void)fprintf(stderr, "Menu %s has "
 				"too many options.\n",
 				menus[i]->info->title);
-			exit (1);
+			exit(1);
+		}
-		(void) fprintf (out_file,
+		(void)fprintf(out_file, "static menu_ent optent%d[] = {\n", i);
 				"static menu_ent optent%d[] = {\n", i);
 		name_is_code = 0;
 		for (j = 0, toptn = menus[i]->info->optns; toptn;
 		    toptn = toptn->next, j++) {
 			name_is_code += toptn->name_is_code;
-			(void) fprintf (out_file, "\t{%s,%d,%d,",
+			(void)fprintf(out_file, "\t{%s,%d,%d,",
 				toptn->name_is_code ? "0" : toptn->name,
 				toptn->menu,
 				(toptn->issub ? OPT_SUB : 0)
 				+(toptn->doexit ? OPT_EXIT : 0)
 				+(toptn->optact.endwin ? OPT_ENDWIN : 0));
 			if (strlen(toptn->optact.code))
-				(void) fprintf (out_file, "opt_act_%d_%d}",
+				(void)fprintf(out_file, "opt_act_%d_%d}", i, j);
 					i, j);
 			else
-				(void) fprintf (out_file, "NULL}");
+				(void)fprintf(out_file, "NULL}");
-			(void) fprintf (out_file, "%s\n",
+			(void)fprintf(out_file, "%s\n",
 				(toptn->next ? "," : ""));
+		}
-		(void) fprintf (out_file, "\t};\n\n");
+		(void)fprintf(out_file, "\t};\n\n");
 		if (name_is_code) {
 			menus[i]->info->name_is_code = 1;
 			fprintf(out_file, "static void menu_%d_legend("
 			    "menudesc *menu, int opt, void *arg)\n{\n"
 			    "\tswitch (opt) {\n", i);
 			for (j = 0, toptn = menus[i]->info->optns; toptn;
 			    toptn = toptn->next, j++) {
 				if (!toptn->name_is_code)
 					continue;
 				fprintf(out_file, "\tcase %d:\n\t\t{%s};\n"
 				    "\t\tbreak;\n", j, toptn->name);
+			}
 			fprintf(out_file, "\t}\n}\n\n");
+		}
+	}
 	/* menus */
-	if (!do_dynamic) {
+	if (!do_dynamic)
-	    (void) fprintf (out_file, "static int num_menus = %d;\n", menu_no);
+		(void)fprintf(out_file, "static int num_menus = %d;\n",
 		    menu_no);
-	(void) fprintf (out_file, "static struct menudesc menu_def[] = {\n");
+	(void)fprintf(out_file, "static struct menudesc menu_def[] = {\n");
-	for (i=0; i<menu_no; i++) {
+	for (i = 0; i < menu_no; i++) {
-		(void) fprintf (out_file,
+		(void)fprintf(out_file,
 			"\t{%s,%d,%d,%d,%d,%d,%d,0,0,optent%d,NULL,NULL,",
 			menus[i]->info->title, 	menus[i]->info->y,
 			menus[i]->info->x, menus[i]->info->h,
 			menus[i]->info->w, menus[i]->info->mopt,
 			menus[i]->info->numopt, i);
 		if (menus[i]->info->helpstr == NULL)
-			(void) fprintf (out_file, "NULL");
+			(void)fprintf(out_file, "NULL");
 		else {
 			tmpstr = menus[i]->info->helpstr;
 			if (*tmpstr != '"')
 				(void)fprintf(out_file, "%s", tmpstr);
 			else {
 				/* Skip an initial newline. */
 				if (tmpstr[1] == '\n')
 					*++tmpstr = '"';
-				(void) fprintf (out_file, "\n");
+				(void)fprintf(out_file, "\n");
 				while (*tmpstr) {
 					if (*tmpstr != '\n') {
-						fputc (*tmpstr++, out_file);
+						fputc(*tmpstr++, out_file);
 						continue;
+					}
-					(void) fprintf (out_file, "\\n\"\n\"");
+					(void)fprintf(out_file, "\\n\"\n\"");
 					tmpstr++;
+				}
+			}
+		}
-		(void) fprintf (out_file, ",");
+		(void)fprintf(out_file, ",");
 		if (menus[i]->info->mopt & MC_NOEXITOPT)
 			(void) fprintf (out_file, "NULL");
 		else if (menus[i]->info->exitstr != NULL)
-			(void) fprintf (out_file, "%s",
+			(void)fprintf(out_file, "%s", menus[i]->info->exitstr);
 				menus[i]->info->exitstr);
 		else
-			(void) fprintf (out_file, "\"Exit\"");
+			(void)fprintf(out_file, "\"Exit\"");
 		if (strlen(menus[i]->info->postact.code))
-			(void) fprintf (out_file, ",menu_%d_postact", i);
+			(void)fprintf(out_file, ",menu_%d_postact", i);
 		else
-			(void) fprintf (out_file, ",NULL");
+			(void)fprintf(out_file, ",NULL");
 		if (strlen(menus[i]->info->exitact.code))
-			(void) fprintf (out_file, ",menu_%d_exitact", i);
+			(void)fprintf(out_file, ",menu_%d_exitact", i);
 		else
-			(void) fprintf (out_file, ",NULL");
+			(void)fprintf(out_file, ",NULL");
 		if (menus[i]->info->name_is_code)
-			(void) fprintf (out_file, ",menu_%d_legend", i);
+			(void)fprintf(out_file, ",menu_%d_legend", i);
 		else
-			(void) fprintf (out_file, ",NULL");
+			(void)fprintf(out_file, ",NULL");
-		(void) fprintf (out_file, "},\n");
+		(void)fprintf(out_file, "},\n");
+	}
-	(void) fprintf (out_file, "{NULL, 0, 0, 0, 0, 0, 0, 0, 0, "
+	(void)fprintf(out_file, "{NULL, 0, 0, 0, 0, 0, 0, 0, 0, "
 		"NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}};\n\n");
 	/* __menu_initerror: initscr failed. */
-	(void) fprintf (out_file,
+	(void)fprintf(out_file,
 		"/* __menu_initerror: initscr failed. */\n"
 		"void __menu_initerror (void) {\n");
 	if (error_act.code == NULL) {
-		(void) fprintf (out_file,
+		(void)fprintf(out_file,
 			"\t(void) fprintf (stderr, "
 			"\"%%s: Could not initialize curses\\n\", "
 			"getprogname());\n"
 			"\texit(1);\n"
 			"}\n");
 	} else {
 		if (error_act.endwin)
-			(void) fprintf (out_file, "\tendwin();\n");
+			(void)fprintf(out_file, "\tendwin();\n");
-		(void) fprintf (out_file, "%s\n}\n", error_act.code);
+		(void)fprintf(out_file, "%s\n}\n", error_act.code);
+	}
 	/* Copy menu_sys.def file. */
 	while ((ch = fgetc(sys_file)) != '\014')  /* Control-L */
 		fputc(ch, out_file);
 	if (do_dynamic) {
 		while ((ch = fgetc(sys_file)) != '\n')
 			/* skip it */;
 		while ((ch = fgetc(sys_file)) != EOF)
 			fputc(ch, out_file);
+	}
 	fclose(out_file);
-	fclose (out_file);
+	fclose(sys_file);
 	fclose (sys_file);
+}

 @@ -1,34 +1,30 @@
-/*	$NetBSD: menu_sys.def,v 1.58 2006/02/20 21:06:40 dsl Exp $	*/
+/*	$NetBSD: menu_sys.def,v 1.59 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,33 +1,29 @@
-.\"	$NetBSD: menuc.1,v 1.29 2009/07/11 18:38:30 joerg Exp $
+.\"	$NetBSD: menuc.1,v 1.30 2012/03/06 16:55:18 mbalmer Exp $
 .\"
 .\" Copyright 1997 Piermont Information Systems Inc.
 .\" All rights reserved.
 .\"
 .\" Written by Philip A. Nelson for Piermont Information Systems Inc.
 .\"
 .\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
+.\" 3. The name of Piermont Information Systems Inc. may not be used to endorse
 .\"    must display the following acknowledgement:
 .\"      This product includes software developed for the NetBSD Project by
 .\"      Piermont Information Systems Inc.
 .\" 4. The name of Piermont Information Systems Inc. may not be used to endorse
 .\"    or promote products derived from this software without specific prior
 .\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,34 +1,30 @@
-/*	$NetBSD: parse.y,v 1.15 2006/02/20 21:06:40 dsl Exp $	*/
+/*	$NetBSD: parse.y,v 1.16 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,34 +1,30 @@
-/*	$NetBSD: scan.l,v 1.15 2009/10/29 14:36:14 christos Exp $	*/
+/*	$NetBSD: scan.l,v 1.16 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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

 @@ -1,112 +1,107 @@
-/*	$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $	*/
+/*	$NetBSD: util.c,v 1.5 2012/03/06 16:55:18 mbalmer Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * 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.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    must display the following acknowledgement:
  *      This product includes software develooped for the NetBSD Project by
  *      Piermont Information Systems Inc.
  * 4. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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.
+ *
  */
 /* util.c - utility routines. */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $");
+__RCSID("$NetBSD: util.c,v 1.5 2012/03/06 16:55:18 mbalmer Exp $");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include "defs.h"
 /* Error routine */
 void
 yyerror(const char *fmt, ...)
+{
 	va_list args;
-	va_start (args, fmt);
+	va_start(args, fmt);
-	printf ("%s:%d: ", src_name, line_no);
+	printf("%s:%d: ", src_name, line_no);
-	vfprintf (stdout, fmt, args);
+	vfprintf(stdout, fmt, args);
-	printf ("\n");
+	printf("\n");
-	va_end (args);
+	va_end(args);
 	had_errors = TRUE;
+}
 /* Buffer routines */
 static char *mc_buff = NULL;
 static int mc_size = 0;
 static int mc_loc = 0;
-void buff_add_ch (char ch)
+void
 buff_add_ch(char ch)
+{
 	char *t;
 	if (mc_loc >= mc_size-1) {
 		if (mc_size == 0)
 			mc_size = 80;
 		else
 			mc_size *= 2;
-		t = (char *) malloc (mc_size);
+		t = (char *)malloc(mc_size);
 		if (t == NULL) {
-			(void) fprintf (stderr, "%s:%d: Malloc error\n",
+			(void)fprintf(stderr, "%s:%d: Malloc error\n",
 					 src_name, line_no);
-			exit (1);
+			exit(1);
+		}
 		if (mc_buff != NULL) {
-			strcpy (t, mc_buff);
+			strcpy(t, mc_buff);
-			free (mc_buff);
+			free(mc_buff);
+		}
 		mc_buff = t;
+	}
 	mc_buff[mc_loc++] = ch;
 	mc_buff[mc_loc] = '\0';
+}
 /* get a copy of the string ! */
 char *
-buff_copy (void)
+buff_copy(void)
+{
-	char *res = strdup (mc_buff);
+	char *res = strdup(mc_buff);
 	mc_loc = 0;
 	mc_buff[0] = '\0';
-	return  res;
+	return res;
+}