--- lbbs/src/menu.c	2005/03/21 17:08:21	1.13
+++ lbbs/src/menu.c	2005/05/06 15:48:44	1.17
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "bbs.h"
+#include "bbs_cmd.h"
 #include "menu.h"
 #include "io.h"
 #include "common.h"
@@ -101,7 +102,7 @@ load_menu (MENU_SET * p_menu_set, const
 		    }
 		  if (ireg ("^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+),"
 			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\","
 			    "[[:space:]]*\"([^\"]+)\"",
 			    buffer, 8, pmatch) == 0)
 		    {
@@ -151,7 +152,7 @@ load_menu (MENU_SET * p_menu_set, const
 		    }
 		  if (ireg ("^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
 			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\","
 			    "[[:space:]]*\"([^\"]+)\"",
 			    buffer, 8, pmatch) == 0)
 		    {
@@ -352,14 +353,14 @@ display_current_menu (MENU_SET * p_menu_
   return display_menu (p_menu);
 }
 
-const char *
+int
 menu_control (MENU_SET * p_menu_set, int key)
 {
   int i;
   MENU *p_menu;
 
   if (p_menu_set->menu_count == 0)
-    return "";
+    return 0;
 
   p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
 
@@ -382,7 +383,8 @@ menu_control (MENU_SET * p_menu_set, int
 	}
       else
 	{
-	  return (p_menu->items[p_menu->item_cur_pos]->action);
+	  return (exec_cmd(p_menu->items[p_menu->item_cur_pos]->action,
+	    p_menu->items[p_menu->item_cur_pos]->name));
 	}
     case KEY_LEFT:
       if (p_menu_set->menu_select_depth > 0)
@@ -428,15 +430,49 @@ menu_control (MENU_SET * p_menu_set, int
     default:
       for (i = 0; i < p_menu->item_count; i++)
 	{
-	  if (toupper (key) == toupper (p_menu->items[i]->name[0]))
+	  if (key == p_menu->items[i]->name[0])
 	    {
 	      display_menu_cursor (p_menu, 0);
 	      p_menu->item_cur_pos = i;
 	      display_menu_cursor (p_menu, 1);
-	      break;
+	      return 0;
 	    }
 	}
+      if (isalpha (key))
+	{
+	  for (i = 0; i < p_menu->item_count; i++)
+	    {
+	      if (toupper (key) == toupper (p_menu->items[i]->name[0]))
+		{
+		  display_menu_cursor (p_menu, 0);
+		  p_menu->item_cur_pos = i;
+		  display_menu_cursor (p_menu, 1);
+		  return 0;
+		}
+	    }
+	}
+    }
+
+  return 0;
+}
+
+void
+unload_menu (MENU_SET * p_menu_set)
+{
+  MENU *p_menu;
+  MENU_ITEM *p_menuitem;
+  int i, j;
+
+  for (i = 0; i < p_menu_set->menu_count; i++)
+    {
+      p_menu = p_menu_set->p_menu[i];
+      for (j = 0; j < p_menu->item_count; j++)
+	{
+	  free (p_menu->items[j]);
+	}
+      free (p_menu);
     }
 
-  return "";
+  p_menu_set->menu_count = 0;
+  p_menu_set->menu_select_depth = 0;
 }