--- lbbs/src/menu.c	2025/06/16 14:30:44	1.64
+++ lbbs/src/menu.c	2025/10/13 05:30:33	1.72
@@ -14,25 +14,23 @@
  *                                                                         *
  ***************************************************************************/
 
-#define _POSIX_C_SOURCE 200809L
-
 #include "bbs.h"
 #include "bbs_cmd.h"
-#include "user_priv.h"
 #include "bbs_cmd.h"
-#include "menu.h"
-#include "log.h"
+#include "common.h"
 #include "io.h"
+#include "log.h"
+#include "menu.h"
 #include "screen.h"
-#include "common.h"
-#include <string.h>
-#include <stdio.h>
+#include "user_priv.h"
 #include <ctype.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/shm.h>
 #include <sys/ipc.h>
+#include <sys/shm.h>
 
 #define MENU_SCREEN_PATH_PREFIX "var/MENU_SCR_"
 #define MENU_CONF_DELIM_WITH_SPACE " ,\t\r\n"
@@ -40,7 +38,7 @@
 
 #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4)
 
-MENU_SET *p_bbs_menu;
+MENU_SET bbs_menu;
 
 int load_menu(MENU_SET *p_menu_set, const char *conf_file)
 {
@@ -62,6 +60,9 @@ int load_menu(MENU_SET *p_menu_set, cons
 	key_t key;
 	size_t size;
 
+	// Initialize the data structure
+	memset(p_menu_set, 0, sizeof(*p_menu_set));
+
 	// Use trie_dict to search menu_id by menu name
 	p_menu_set->p_menu_name_dict = trie_dict_create();
 	if (p_menu_set->p_menu_name_dict == NULL)
@@ -80,7 +81,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 
 	if ((fin = fopen(conf_file, "r")) == NULL)
 	{
-		log_error("Open %s failed", conf_file);
+		log_error("Open %s failed\n", conf_file);
 		return -2;
 	}
 
@@ -121,6 +122,8 @@ int load_menu(MENU_SET *p_menu_set, cons
 	p_menu_set->menu_screen_count = 0;
 	p_menu_set->choose_step = 0;
 	p_menu_set->menu_id_path[0] = 0;
+	p_menu_set->menu_item_pos[0] = 0;
+	p_menu_set->allow_exit = 0;
 
 	while (fgets(buffer, sizeof(buffer), fin))
 	{
@@ -982,7 +985,16 @@ int display_menu(MENU_SET *p_menu_set)
 			p_menu_set->choose_step--;
 			return REDRAW;
 		}
-		return EXITBBS;
+		return EXITMENU;
+	}
+
+	if(p_menu->item_count <= 0) // empty menu
+	{
+		moveto(p_menu->screen_row, p_menu->screen_col);
+		clrtoeol();
+		prints("没有可选项");
+		press_any_key();
+		return -1;
 	}
 
 	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
@@ -991,7 +1003,7 @@ int display_menu(MENU_SET *p_menu_set)
 	if (p_menu_item == NULL)
 	{
 		log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
-		menu_item_pos = 0;
+		return EXITMENU;
 	}
 
 	if (menu_item_pos > 0 &&
@@ -1055,7 +1067,8 @@ int display_menu(MENU_SET *p_menu_set)
 	if (!menu_selectable)
 	{
 		moveto(p_menu->screen_row, p_menu->screen_col);
-		prints("û�п�ѡ��");
+		clrtoeol();
+		prints("没有可选项");
 		press_any_key();
 		return -1;
 	}
@@ -1101,7 +1114,9 @@ int menu_control(MENU_SET *p_menu_set, i
 
 	if (p_menu->item_count == 0)
 	{
+#ifdef _DEBUG
 		log_error("Empty menu (%s)\n", p_menu->name);
+#endif
 		if (p_menu_set->choose_step > 0)
 		{
 			p_menu_set->choose_step--;
@@ -1152,17 +1167,15 @@ int menu_control(MENU_SET *p_menu_set, i
 		if (p_menu_set->choose_step > 0)
 		{
 			p_menu_set->choose_step--;
-			if (p_menu_set->choose_step == 0)
-			{
-				return REDRAW;
-			}
-			if (display_menu(p_menu_set) != 0)
-			{
-				return menu_control(p_menu_set, KEY_LEFT);
-			}
+			return REDRAW;
 		}
 		else
 		{
+			if (p_menu_set->allow_exit)
+			{
+				return EXITMENU;
+			}
+
 			display_menu_cursor(p_menu_set, 0);
 			menu_item_pos = p_menu->item_count - 1;
 			while (menu_item_pos >= 0)
@@ -1369,6 +1382,31 @@ int unload_menu(MENU_SET *p_menu_set)
 
 	return 0;
 }
+
+int get_menu_shm_readonly(MENU_SET *p_menu_set)
+{
+	void *p_shm;
+
+	p_shm = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);
+	if (p_shm == (void *)-1)
+	{
+		log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
+		return -1;
+	}
+
+	p_menu_set->p_reserved = p_shm;
+	p_menu_set->p_menu_pool = p_menu_set->p_reserved + MENU_SET_RESERVED_LENGTH;
+	p_menu_set->p_menu_item_pool = p_menu_set->p_menu_pool + sizeof(MENU) * MAX_MENUS;
+	p_menu_set->p_menu_screen_pool = p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * MAX_MENUITEMS;
+	p_menu_set->p_menu_screen_buf = p_menu_set->p_menu_screen_pool + sizeof(MENU_SCREEN) * MAX_MENUS;
+	p_menu_set->p_menu_screen_buf_free = p_menu_set->p_menu_screen_buf;
+
+	p_menu_set->choose_step = 0;
+	p_menu_set->menu_id_path[0] = 0;
+	p_menu_set->menu_item_pos[0] = 0;
+
+	return 0;
+}
 
 int set_menu_shm_readonly(MENU_SET *p_menu_set)
 {