--- lbbs/src/menu.c	2025/04/28 03:31:00	1.21
+++ lbbs/src/menu.c	2025/05/06 05:31:26	1.30
@@ -1,37 +1,46 @@
 /***************************************************************************
 						  menu.c  -  description
 							 -------------------
-	begin                : Wed Mar 16 2004
-	copyright            : (C) 2005 by Leaflet
-	email                : leaflet@leafok.com
+	Copyright            : (C) 2004-2025 by Leaflet
+	Email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
+ *   the Free Software Foundation; either version 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bbs.h"
 #include "bbs_cmd.h"
+#include "user_priv.h"
+#include "reg_ex.h"
+#include "bbs_cmd.h"
 #include "menu.h"
+#include "log.h"
 #include "io.h"
+#include "screen.h"
 #include "common.h"
+#include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <regex.h>
 #include <stdlib.h>
 
+#define MENU_TEMP_DIR "var"
+
 MENU_SET bbs_menu;
 
 int load_menu(MENU_SET *p_menu_set, const char *conf_file)
 {
 	FILE *fin, *fout;
 	int i = 0, j;
-	char buffer[256], screen_filename[256], temp[256];
+	char buffer[LINE_BUFFER_LEN];
+	char screen_filename[FILE_PATH_LEN];
+	char temp[LINE_BUFFER_LEN];
 	regmatch_t pmatch[10];
 
 	if ((fin = fopen(conf_file, "r")) == NULL)
@@ -40,9 +49,10 @@ int load_menu(MENU_SET *p_menu_set, cons
 		return -1;
 	}
 
-	strcpy(p_menu_set->conf_file, conf_file);
+	strncpy(p_menu_set->conf_file, conf_file, sizeof(p_menu_set->conf_file) - 1);
+	p_menu_set->conf_file[sizeof(p_menu_set->conf_file) - 1] = '\0';
 
-	while (fgets(buffer, 255, fin))
+	while (fgets(buffer, sizeof(buffer), fin))
 	{
 		switch (buffer[0])
 		{
@@ -52,9 +62,9 @@ int load_menu(MENU_SET *p_menu_set, cons
 			if (ireg("^%S_([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0)
 			{
 				strncpy(temp, buffer + pmatch[1].rm_so,
-						pmatch[1].rm_eo - pmatch[1].rm_so);
+						(size_t)(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);
+				snprintf(screen_filename, sizeof(screen_filename), "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp);
 
 				if ((fout = fopen(screen_filename, "w")) == NULL)
 				{
@@ -62,7 +72,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 					return -2;
 				}
 
-				while (fgets(buffer, 255, fin))
+				while (fgets(buffer, sizeof(buffer), fin))
 				{
 					if (buffer[0] != '%')
 						fputs(buffer, fout);
@@ -82,13 +92,13 @@ int load_menu(MENU_SET *p_menu_set, cons
 
 				strncpy(p_menu_set->p_menu[i]->name,
 						buffer + pmatch[1].rm_so,
-						pmatch[1].rm_eo - pmatch[1].rm_so);
+						(size_t)(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))
+				while (fgets(buffer, sizeof(buffer), fin))
 				{
 					if (buffer[0] == '#')
 					{
@@ -112,37 +122,37 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p_menu_set->p_menu[i]->items[j]->submenu = 1;
 						strncpy(p_menu_set->p_menu[i]->items[j]->action,
 								buffer + pmatch[1].rm_so,
-								pmatch[1].rm_eo - pmatch[1].rm_so);
+								(size_t)(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);
+								(size_t)(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);
+								(size_t)(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);
+								(size_t)(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(temp,
 								buffer + pmatch[5].rm_so,
-								pmatch[5].rm_eo - pmatch[5].rm_so);
+								(size_t)(pmatch[5].rm_eo - pmatch[5].rm_so));
 						temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
 						p_menu_set->p_menu[i]->items[j]->level = atoi(temp);
 						strncpy(p_menu_set->p_menu[i]->items[j]->name,
 								buffer + pmatch[6].rm_so,
-								pmatch[6].rm_eo - pmatch[6].rm_so);
+								(size_t)(pmatch[6].rm_eo - pmatch[6].rm_so));
 						p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
 															  pmatch[6].rm_so] =
 							'\0';
 						strncpy(p_menu_set->p_menu[i]->items[j]->text,
 								buffer + pmatch[7].rm_so,
-								pmatch[7].rm_eo - pmatch[7].rm_so);
+								(size_t)(pmatch[7].rm_eo - pmatch[7].rm_so));
 						p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
 															  pmatch[7].rm_so] =
 							'\0';
@@ -160,37 +170,37 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p_menu_set->p_menu[i]->items[j]->submenu = 0;
 						strncpy(p_menu_set->p_menu[i]->items[j]->action,
 								buffer + pmatch[1].rm_so,
-								pmatch[1].rm_eo - pmatch[1].rm_so);
+								(size_t)(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);
+								(size_t)(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);
+								(size_t)(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);
+								(size_t)(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(temp,
 								buffer + pmatch[5].rm_so,
-								pmatch[5].rm_eo - pmatch[5].rm_so);
+								(size_t)(pmatch[5].rm_eo - pmatch[5].rm_so));
 						temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
 						p_menu_set->p_menu[i]->items[j]->level = atoi(temp);
 						strncpy(p_menu_set->p_menu[i]->items[j]->name,
 								buffer + pmatch[6].rm_so,
-								pmatch[6].rm_eo - pmatch[6].rm_so);
+								(size_t)(pmatch[6].rm_eo - pmatch[6].rm_so));
 						p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
 															  pmatch[6].rm_so] =
 							'\0';
 						strncpy(p_menu_set->p_menu[i]->items[j]->text,
 								buffer + pmatch[7].rm_so,
-								pmatch[7].rm_eo - pmatch[7].rm_so);
+								(size_t)(pmatch[7].rm_eo - pmatch[7].rm_so));
 						p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
 															  pmatch[7].rm_so] =
 							'\0';
@@ -204,17 +214,17 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p_menu_set->p_menu[i]->title.show = 1;
 						strncpy(temp,
 								buffer + pmatch[1].rm_so,
-								pmatch[1].rm_eo - pmatch[1].rm_so);
+								(size_t)(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[2].rm_so,
-								pmatch[2].rm_eo - pmatch[2].rm_so);
+								(size_t)(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[3].rm_so,
-								pmatch[3].rm_eo - pmatch[3].rm_so);
+								(size_t)(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';
@@ -227,20 +237,21 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p_menu_set->p_menu[i]->screen.show = 1;
 						strncpy(temp,
 								buffer + pmatch[1].rm_so,
-								pmatch[1].rm_eo - pmatch[1].rm_so);
+								(size_t)(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[2].rm_so,
-								pmatch[2].rm_eo - pmatch[2].rm_so);
+								(size_t)(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[3].rm_so,
-								pmatch[3].rm_eo - pmatch[3].rm_so);
+								(size_t)(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);
+						snprintf(p_menu_set->p_menu[i]->screen.filename,
+								 sizeof(p_menu_set->p_menu[i]->screen.filename),
+								 "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp);
 						continue;
 					}
 				}
@@ -273,64 +284,81 @@ get_menu(MENU_SET *p_menu_set, const cha
 	return NULL;
 }
 
-static void
-display_menu_cursor(MENU *p_menu, int show)
+static void display_menu_cursor(MENU *p_menu, int show)
 {
 	moveto((p_menu->items[p_menu->item_cur_pos])->r_row,
 		   (p_menu->items[p_menu->item_cur_pos])->r_col - 2);
-	prints(show ? ">" : " ");
+	outc(show ? '>' : ' ');
 	iflush();
 }
 
 int display_menu(MENU *p_menu)
 {
-	int i, row, col, menu_selectable = 0;
+	int row = 0;
+	int col = 0;
+	int menu_selectable = 0;
 
 	if (p_menu == NULL)
+	{
 		return -1;
+	}
 
 	if (p_menu->title.show)
+	{
 		show_top(p_menu->title.text);
+	}
 
 	if (p_menu->screen.show)
 	{
 		moveto(p_menu->screen.row, p_menu->screen.col);
 		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;
-
-	for (i = 0; i < p_menu->item_count; i++)
+	for (int i = 0; i < p_menu->item_count; i++)
 	{
+		if (p_menu->items[i]->row != 0)
+		{
+			row = p_menu->items[i]->row;
+		}
+		if (p_menu->items[i]->col != 0)
+		{
+			col = p_menu->items[i]->col;
+		}
+
 		if (checkpriv(&BBS_priv, 0, p_menu->items[i]->priv) == 0 || checklevel(&BBS_priv, p_menu->items[i]->level) == 0)
 		{
 			p_menu->items[i]->display = 0;
+			p_menu->items[i]->r_row = 0;
+			p_menu->items[i]->r_col = 0;
 		}
 		else
 		{
 			p_menu->items[i]->display = 1;
 
-			menu_selectable = 1;
+			if (!menu_selectable)
+			{
+				p_menu->item_cur_pos = i;
+				menu_selectable = 1;
+			}
 
-			if (p_menu->items[i]->row != 0)
-				row = p_menu->items[i]->row;
-			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);
-			prints(p_menu->items[i]->text);
-			iflush();
+			prints("%s", p_menu->items[i]->text);
+
+			row++;
 		}
 	}
 
 	if (!menu_selectable)
+	{
 		return -1;
+	}
 
 	display_menu_cursor(p_menu, 1);
 
@@ -352,25 +380,31 @@ int menu_control(MENU_SET *p_menu_set, i
 	MENU *p_menu;
 
 	if (p_menu_set->menu_count == 0)
+	{
 		return 0;
+	}
 
 	p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
 
 	switch (key)
 	{
 	case CR:
+		igetch(1); // Cleanup remaining '\n' in the buffer
 	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] =
-					get_menu(p_menu_set,
-							 p_menu->items[p_menu->item_cur_pos]->action);
+			p_menu = get_menu(p_menu_set, p_menu->items[p_menu->item_cur_pos]->action);
+			p_menu_set->p_menu_select[p_menu_set->menu_select_depth] = p_menu;
+
 			if (display_menu(p_menu) != 0)
+			{
 				return menu_control(p_menu_set, KEY_LEFT);
+			}
 			break;
 		}
 		else
@@ -383,15 +417,21 @@ int menu_control(MENU_SET *p_menu_set, i
 		{
 			p_menu_set->menu_select_depth--;
 			if (display_current_menu(p_menu_set) != 0)
+			{
 				return menu_control(p_menu_set, KEY_LEFT);
+			}
 			break;
 		}
 		else
 		{
 			display_menu_cursor(p_menu, 0);
 			p_menu->item_cur_pos = p_menu->item_count - 1;
-			while (!p_menu->items[p_menu->item_cur_pos]->display || p_menu->items[p_menu->item_cur_pos]->priv != 0 || p_menu->items[p_menu->item_cur_pos]->level != 0)
+			while (!p_menu->items[p_menu->item_cur_pos]->display ||
+				   p_menu->items[p_menu->item_cur_pos]->priv != 0 ||
+				   p_menu->items[p_menu->item_cur_pos]->level != 0)
+			{
 				p_menu->item_cur_pos--;
+			}
 			display_menu_cursor(p_menu, 1);
 			break;
 		}
@@ -401,7 +441,9 @@ int menu_control(MENU_SET *p_menu_set, i
 		{
 			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;
@@ -411,7 +453,9 @@ int menu_control(MENU_SET *p_menu_set, i
 		{
 			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;
@@ -449,7 +493,6 @@ int menu_control(MENU_SET *p_menu_set, i
 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++)
@@ -470,9 +513,11 @@ void unload_menu(MENU_SET *p_menu_set)
 int reload_menu(MENU_SET *p_menu_set)
 {
 	int result;
-	char conf_file[256];
+	char conf_file[FILE_PATH_LEN];
+
+	strncpy(conf_file, p_menu_set->conf_file, sizeof(conf_file) - 1);
+	conf_file[sizeof(conf_file) - 1] = '\0';
 
-	strcpy(conf_file, p_menu_set->conf_file);
 	unload_menu(p_menu_set);
 	result = load_menu(p_menu_set, conf_file);