diff --git a/usr.bin/menuc/mdb.c b/usr.bin/menuc/mdb.c
index 606a16fefc38..c997025667e7 100644
--- a/usr.bin/menuc/mdb.c
+++ b/usr.bin/menuc/mdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdb.c,v 1.29 2003/05/16 19:57:22 dsl Exp $	*/
+/*	$NetBSD: mdb.c,v 1.30 2003/06/03 11:51:56 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -163,19 +163,18 @@ write_menu_file (char *initcode)
 		(void) fprintf (out_file, "#define DYNAMIC_MENUS\n\n");
 
 	(void) fprintf (out_file,
-		"struct menudesc;\n"	
-		"typedef\n"
+		"typedef struct menudesc menudesc;\n"	
+		"typedef struct menu_ent menu_ent;\n"	
 		"struct menu_ent {\n"
 		"	const char	*opt_name;\n"
 		"	int		opt_menu;\n"
 		"	int		opt_flags;\n"
-		"	int		(*opt_action)(struct menudesc *);\n"
-		"} menu_ent ;\n\n"
+		"	int		(*opt_action)(menudesc *, menu_ent *, void *);\n"
+		"};\n\n"
 		"#define OPT_SUB	1\n"
 		"#define OPT_ENDWIN	2\n"
 		"#define OPT_EXIT	4\n"
 		"#define OPT_NOMENU	-1\n\n"
-		"typedef\n"
 		"struct menudesc {\n"
 		"	const char	*title;\n"
 		"	int		y, x;\n"
@@ -190,7 +189,7 @@ write_menu_file (char *initcode)
 		"	const char	*exitstr;\n"
 		"	void		(*post_act)(void);\n"
 		"	void		(*exit_act)(void);\n"
-		"} menudesc ;\n"
+		"};\n"
 		"\n"
 		"/* defines for mopt field. */\n"
 		"#define MC_NOEXITOPT 1\n"
@@ -207,7 +206,7 @@ write_menu_file (char *initcode)
 		"\n"
 		"/* Prototypes */\n"
 		"int menu_init (void);\n"
-		"void process_menu (int num);\n"
+		"void process_menu (int num, void *arg);\n"
 		"void __menu_initerror (void);\n"
 		);
 
@@ -275,20 +274,16 @@ write_menu_file (char *initcode)
 		}
 		j = 0;
 		toptn = menus[i]->info->optns;
-		while (toptn != NULL) {
-			if (strlen(toptn->optact.code)) {
-				(void) fprintf (out_file,
-					"int opt_act_%d_%d(menudesc *m);\n"
-					"/*ARGSUSED*/\n"
-					"int opt_act_%d_%d(menudesc *m)\n"
-					"{\t%s\n\treturn %s;\n}\n\n",
-					i, j, i, j, toptn->optact.code,
-					(toptn->doexit ? "1" : "0"));
-						
-				
-			}
-			j++;
-			toptn = toptn->next;
+		for (;toptn != NULL; j++, toptn = toptn->next) {
+			if (strlen(toptn->optact.code) == 0)
+				continue;
+
+			(void) fprintf (out_file,
+				"/*ARGSUSED*/\n"
+				"static int opt_act_%d_%d(menudesc *m, menu_ent *opt, void *arg)\n"
+				"{\n\t%s\n\treturn %s;\n}\n\n",
+				i, j, toptn->optact.code,
+				(toptn->doexit ? "1" : "0"));
 		}
 
 	}
diff --git a/usr.bin/menuc/menu_sys.def b/usr.bin/menuc/menu_sys.def
index 46c36c203420..3b9533d42302 100644
--- a/usr.bin/menuc/menu_sys.def
+++ b/usr.bin/menuc/menu_sys.def
@@ -1,4 +1,4 @@
-/*	$NetBSD: menu_sys.def,v 1.36 2003/06/03 08:49:53 dsl Exp $	*/
+/*	$NetBSD: menu_sys.def,v 1.37 2003/06/03 11:51:56 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -520,11 +520,12 @@ menu_init(void)
 }
 
 void
-process_menu(int num)
+process_menu(int num, void *arg)
 {
 	int sel = 0;
 	int req, done;
 	int last_num;
+	menu_ent *opt;
 
 	struct menudesc *m;
 
@@ -571,20 +572,21 @@ process_menu(int num)
 
 		/* Process the items */
 		if (sel < m->numopts) {
-			if (m->opts[sel].opt_flags & OPT_ENDWIN) {
+			opt = &m->opts[sel];
+			if (opt->opt_flags & OPT_ENDWIN) {
 				endwin();
 				__m_endwin = 1;
 			}
-			if (m->opts[sel].opt_action)
-				done = (*m->opts[sel].opt_action)(m);
-			if (m->opts[sel].opt_menu != -1) {
-				if (m->opts[sel].opt_flags & OPT_SUB)
-					process_menu(m->opts[sel].opt_menu);
+			if (opt->opt_action)
+				done = (*opt->opt_action)(m, opt, arg);
+			if (opt->opt_menu != -1) {
+				if (opt->opt_flags & OPT_SUB)
+					process_menu(opt->opt_menu, arg);
 				else
-					num = m->opts[sel].opt_menu;
+					num = opt->opt_menu;
 			}
 
-                        if (m->opts[sel].opt_flags & OPT_EXIT) 
+                        if (opt->opt_flags & OPT_EXIT) 
                                 done = TRUE;
  				
 		} else
@@ -619,8 +621,8 @@ double_menus(void)
 	temp  = malloc(sizeof(menudesc) * num_menus * 2);
 	if (temp == NULL)
 		return 0;
-	(void) memset(temp, 0, sizeof(menudesc) * num_menus * 2);
-	(void) memcpy(temp, menus, sizeof(menudesc) * num_menus);
+	(void)memset(temp, 0, sizeof(menudesc) * num_menus * 2);
+	(void)memcpy(temp, menus, sizeof(menudesc) * num_menus);
 	free(menus);
 	menus = temp;
 	num_avail = num_menus;