--- lbbs/src/menu.c	2005/03/19 13:46:26	1.4
+++ lbbs/src/menu.c	2005/03/20 17:23:17	1.9
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <regex.h>
+#include <stdlib.h>
 
 MENU_SET bbs_menu;
 
@@ -46,11 +47,12 @@ load_menu (MENU_SET * p_menu_set, const
 	case '#':
 	  break;
 	case '%':
-	  if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
+	  if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0)
 	    {
-	      strncpy (temp, buffer + pmatch[0].rm_so,
-		       pmatch[0].rm_eo - pmatch[0].rm_so + 1);
-	      sprintf (screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp);
+	      strncpy (temp, buffer + pmatch[1].rm_so,
+		       pmatch[1].rm_eo - pmatch[1].rm_so);
+	      temp [pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
+              sprintf (screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp);
 
 	      if ((fout = fopen (screen_filename, "w")) == NULL)
 		{
@@ -70,14 +72,15 @@ load_menu (MENU_SET * p_menu_set, const
 	      break;
 	    }
 
-	  if (ireg ("^%menu ([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
+	  if (ireg ("^%menu ([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0)
 	    {
 	      p_menu_set->p_menu[i] = malloc (sizeof (MENU));
 
 	      strncpy (p_menu_set->p_menu[i]->name,
-	        buffer + pmatch[0].rm_so,
-	        pmatch[0].rm_eo - pmatch[0].rm_so + 1);
-	      
+	        buffer + pmatch[1].rm_so,
+	        pmatch[1].rm_eo - pmatch[1].rm_so);
+              p_menu_set->p_menu[i]->name[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
+
 	      j = 0;
 	      
 	      while (fgets (buffer, 255, fin))
@@ -97,31 +100,37 @@ load_menu (MENU_SET * p_menu_set, const
 	            "^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+),"
 	            "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
 	            "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-	            buffer, 6, pmatch) == 0)
+	            buffer, 7, pmatch) == 0)
 	            {
 	              p_menu_set->p_menu[i]->items[j] = malloc (sizeof (MENU_ITEM));
 	              p_menu_set->p_menu[i]->items[j]->submenu = 1;
 	              strncpy (p_menu_set->p_menu[i]->items[j]->action,
-	                buffer + pmatch[0].rm_so,
-	                pmatch[0].rm_eo - pmatch[0].rm_so + 1);
-	              strncpy (temp,
 	                buffer + pmatch[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so + 1);
-	              p_menu_set->p_menu[i]->items[j]->row = atoi (temp);
-	              strncpy (temp,
+	                pmatch[1].rm_eo - pmatch[1].rm_so);
+	              p_menu_set->p_menu[i]->items[j]->action[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
+                      strncpy (temp,
 	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
-	              p_menu_set->p_menu[i]->items[j]->col = atoi (temp);
+	                pmatch[2].rm_eo - pmatch[2].rm_so);
+                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+	              p_menu_set->p_menu[i]->items[j]->row = atoi (temp);
 	              strncpy (temp,
 	                buffer + pmatch[3].rm_so,
-	                pmatch[3].rm_eo - pmatch[3].rm_so + 1);
-	              p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
-	              strncpy (p_menu_set->p_menu[i]->items[j]->name,
+	                pmatch[3].rm_eo - pmatch[3].rm_so);
+	              temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
+                      p_menu_set->p_menu[i]->items[j]->col = atoi (temp);
+	              strncpy (temp,
 	                buffer + pmatch[4].rm_so,
-	                pmatch[4].rm_eo - pmatch[4].rm_so + 1);
-	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
+	                pmatch[4].rm_eo - pmatch[4].rm_so);
+                      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
+                      p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
+	              strncpy (p_menu_set->p_menu[i]->items[j]->name,
 	                buffer + pmatch[5].rm_so,
-	                pmatch[5].rm_eo - pmatch[5].rm_so + 1);
+	                pmatch[5].rm_eo - pmatch[5].rm_so);
+                      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
+	                buffer + pmatch[6].rm_so,
+	                pmatch[6].rm_eo - pmatch[6].rm_so);
+                      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0';
 	              j++;
 	              continue;
 	            }
@@ -129,68 +138,80 @@ load_menu (MENU_SET * p_menu_set, const
 	            "^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
 	            "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
 	            "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-	            buffer, 6, pmatch) == 0)
+	            buffer, 7, pmatch) == 0)
 	            {
 	              p_menu_set->p_menu[i]->items[j] = malloc (sizeof (MENU_ITEM));
 	              p_menu_set->p_menu[i]->items[j]->submenu = 0;
 	              strncpy (p_menu_set->p_menu[i]->items[j]->action,
-	                buffer + pmatch[0].rm_so,
-	                pmatch[0].rm_eo - pmatch[0].rm_so + 1);
-	              strncpy (temp,
 	                buffer + pmatch[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so + 1);
-	              p_menu_set->p_menu[i]->items[j]->row = atoi (temp);
+	                pmatch[1].rm_eo - pmatch[1].rm_so);
+                      p_menu_set->p_menu[i]->items[j]->action[pmatch[0].rm_eo - pmatch[0].rm_so] = '\0';
 	              strncpy (temp,
 	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
-	              p_menu_set->p_menu[i]->items[j]->col = atoi (temp);
+	                pmatch[2].rm_eo - pmatch[2].rm_so);
+                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+	              p_menu_set->p_menu[i]->items[j]->row = atoi (temp);
 	              strncpy (temp,
 	                buffer + pmatch[3].rm_so,
-	                pmatch[3].rm_eo - pmatch[3].rm_so + 1);
+	                pmatch[3].rm_eo - pmatch[3].rm_so);
+                      temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
+	              p_menu_set->p_menu[i]->items[j]->col = atoi (temp);
+	              strncpy (temp,
+	                buffer + pmatch[4].rm_so,
+	                pmatch[4].rm_eo - pmatch[4].rm_so);
+                      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
 	              p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
 	              strncpy (p_menu_set->p_menu[i]->items[j]->name,
-	                buffer + pmatch[4].rm_so,
-	                pmatch[4].rm_eo - pmatch[4].rm_so + 1);
-	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
 	                buffer + pmatch[5].rm_so,
-	                pmatch[5].rm_eo - pmatch[5].rm_so + 1);
+	                pmatch[5].rm_eo - pmatch[5].rm_so);
+                      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
+	                buffer + pmatch[6].rm_so,
+	                pmatch[6].rm_eo - pmatch[6].rm_so);
+                      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0';
 	              j++;
 	              continue;
 	            }
 	          if (ireg (
 	            "^title[[:space:]]*([0-9]+),"
 	            "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\"",
-	            buffer, 3, pmatch) == 0)
+	            buffer, 4, pmatch) == 0)
 	            {
 	              strncpy (temp,
-	                buffer + pmatch[0].rm_so,
-	                pmatch[0].rm_eo - pmatch[0].rm_so + 1);
+	                buffer + pmatch[1].rm_so,
+	                pmatch[1].rm_eo - pmatch[1].rm_so);
+                      temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
 	              p_menu_set->p_menu[i]->title.row = atoi (temp);
 	              strncpy (temp,
-	                buffer + pmatch[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so + 1);
+	                buffer + pmatch[2].rm_so,
+	                pmatch[2].rm_eo - pmatch[2].rm_so);
+                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
 	              p_menu_set->p_menu[i]->title.col = atoi (temp);
 	              strncpy (p_menu_set->p_menu[i]->title.text,
-	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
+	                buffer + pmatch[3].rm_so,
+	                pmatch[3].rm_eo - pmatch[3].rm_so);
+                      p_menu_set->p_menu[i]->title.text[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
 	              continue;
 	            }
 	          if (ireg (
-	            "^title[[:space:]]*([0-9]+),"
+	            "^screen[[:space:]]*([0-9]+),"
 	            "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)",
-	            buffer, 3, pmatch) == 0)
+	            buffer, 4, pmatch) == 0)
 	            {
 	              strncpy (temp,
-	                buffer + pmatch[0].rm_so,
-	                pmatch[0].rm_eo - pmatch[0].rm_so + 1);
+	                buffer + pmatch[1].rm_so,
+	                pmatch[1].rm_eo - pmatch[1].rm_so);
+                      temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
 	              p_menu_set->p_menu[i]->screen.row = atoi (temp);
 	              strncpy (temp,
-	                buffer + pmatch[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so + 1);
+	                buffer + pmatch[2].rm_so,
+	                pmatch[2].rm_eo - pmatch[2].rm_so);
+                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
 	              p_menu_set->p_menu[i]->screen.col = atoi (temp);
 	              strncpy (temp,
-	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
+	                buffer + pmatch[3].rm_so,
+	                pmatch[3].rm_eo - pmatch[3].rm_so);
+                      temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
 	              sprintf (p_menu_set->p_menu[i]->screen.filename, 
 	                "%sMENU_SCR_%s", app_temp_dir, temp);
 	              continue;
@@ -214,6 +235,7 @@ MENU *
 get_menu (MENU_SET * p_menu_set, const char * menu_name)
 {
   int i;
+
   for (i = 0; i < p_menu_set->menu_count; i++)
   {
     if (strcmp(p_menu_set->p_menu[i]->name, menu_name) == 0)
@@ -221,6 +243,8 @@ get_menu (MENU_SET * p_menu_set, const c
       return p_menu_set->p_menu[i];
     }
   }
+
+  return NULL;
 }
 
 void
@@ -237,10 +261,14 @@ display_menu (MENU * p_menu)
 {
   int i, row, col, menu_selectable = 0;
 
+  if (p_menu == NULL)
+    return -1;
+
   show_top (p_menu->title.text);
 
   moveto (p_menu->screen.row, p_menu->screen.col); 
-  display_file (p_menu->screen.filename);
+  if (display_file (p_menu->screen.filename) != 0)
+    log_error ("Display menu screen <%s> failed!\n", p_menu->screen.filename);
 
   row = p_menu->items[0]->row;
   col = p_menu->items[0]->col;
@@ -257,14 +285,12 @@ display_menu (MENU * p_menu)
 
         menu_selectable = 1;
         
-        if (p_menu->items[i]->row == 0)
-          row ++;
-        else
+        if (p_menu->items[i]->row != 0)
           row = p_menu->items[i]->row;
-        p_menu->items[i]->r_row = row;
-        if (p_menu->items[i]->col == 0)
-          col ++;
         else
+          row ++;
+        p_menu->items[i]->r_row = row;
+        if (p_menu->items[i]->col != 0)
           col = p_menu->items[i]->col;
         p_menu->items[i]->r_col = col;
         moveto (row, col);
@@ -298,6 +324,8 @@ menu_control (MENU_SET * p_menu_set, int
     case KEY_RIGHT:
       if (p_menu->items[p_menu->item_cur_pos]->submenu)
         {
+          if (strcmp (p_menu->items[p_menu->item_cur_pos]->action, "..") == 0)
+            return menu_control (p_menu_set, KEY_LEFT);
           p_menu_set->menu_select_depth ++;
           p_menu =
             p_menu_set->p_menu_select[p_menu_set->menu_select_depth] =
@@ -308,10 +336,7 @@ menu_control (MENU_SET * p_menu_set, int
         }
       else
         {
-          if (strcmp (p_menu->items[p_menu->item_cur_pos]->action, "..") == 0)
-            return menu_control (p_menu_set, KEY_LEFT);
-          else
-            return (p_menu->items[p_menu->item_cur_pos]->action);
+          return (p_menu->items[p_menu->item_cur_pos]->action);
         }
     case KEY_LEFT:
       if (p_menu_set->menu_select_depth > 0)
@@ -334,24 +359,22 @@ menu_control (MENU_SET * p_menu_set, int
         }
     case KEY_UP:
       display_menu_cursor (p_menu, 0);
-      p_menu->item_cur_pos --;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        p_menu->item_cur_pos --;
-      if (p_menu->item_cur_pos < 0)
-	p_menu->item_cur_pos = p_menu->item_count - 1;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        p_menu->item_cur_pos --;
+      do
+      {
+         p_menu->item_cur_pos --;
+         if (p_menu->item_cur_pos < 0)
+           p_menu->item_cur_pos = p_menu->item_count - 1;
+      } while (!p_menu->items[p_menu->item_cur_pos]->display);
       display_menu_cursor (p_menu, 1);
       break;
     case KEY_DOWN:
       display_menu_cursor (p_menu, 0);
-      p_menu->item_cur_pos++;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        p_menu->item_cur_pos ++;
-      if (p_menu->item_cur_pos >= p_menu->item_count)
-	p_menu->item_cur_pos = 0;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        p_menu->item_cur_pos ++;
+      do
+      {
+        p_menu->item_cur_pos++;
+        if (p_menu->item_cur_pos >= p_menu->item_count)
+	  p_menu->item_cur_pos = 0;
+      } while (!p_menu->items[p_menu->item_cur_pos]->display);
       display_menu_cursor (p_menu, 1);
       break;
     default: