--- lbbs/src/screen.c	2025/05/05 09:30:22	1.32
+++ lbbs/src/screen.c	2025/05/06 12:10:22	1.38
@@ -1,16 +1,15 @@
 /***************************************************************************
 						  screen.c  -  description
 							 -------------------
-	begin                : Mon Oct 18 2004
-	copyright            : (C) 2004 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.                                   *
  *                                                                         *
  ***************************************************************************/
@@ -102,14 +101,14 @@ void set_input_echo(int echo)
 	}
 }
 
-static int _str_input(char *buffer, int buffer_length, int echo_mode)
+static int _str_input(char *buffer, int buf_size, int echo_mode)
 {
-	int c, offset = 0, i, hz = 0;
+	int c;
+	int offset = 0;
+	int hz = 0;
 
-	for (i = 0; i < buffer_length && buffer[i] != '\0'; i++)
-	{
-		offset++;
-	}
+	buffer[buf_size - 1] = '\0';
+	for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++);
 
 	while ((c = igetch_t(60)))
 	{
@@ -149,7 +148,7 @@ static int _str_input(char *buffer, int
 		}
 		if (c > 127 && c <= 255)
 		{
-			if (!hz && offset + 2 > buffer_length) // No enough space for Chinese character
+			if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character
 			{
 				igetch(1); // Cleanup remaining input
 				outc('\a');
@@ -158,7 +157,7 @@ static int _str_input(char *buffer, int
 			}
 			hz = (!hz);
 		}
-		if (offset >= buffer_length)
+		if (offset + 1 > buf_size - 1)
 		{
 			outc('\a');
 			iflush();
@@ -184,13 +183,13 @@ static int _str_input(char *buffer, int
 	return offset;
 }
 
-int str_input(char *buffer, int buffer_length, int echo_mode)
+int str_input(char *buffer, int buf_size, int echo_mode)
 {
 	int len;
 
 	buffer[0] = '\0';
 
-	len = _str_input(buffer, buffer_length, echo_mode);
+	len = _str_input(buffer, buf_size, echo_mode);
 
 	prints("\r\n");
 	iflush();
@@ -198,16 +197,18 @@ int str_input(char *buffer, int buffer_l
 	return len;
 };
 
-int get_data(int row, int col, char *prompt, char *buffer, int buffer_length, int echo_mode)
+int get_data(int row, int col, char *prompt, char *buffer, int buf_size, int echo_mode)
 {
 	int len;
 
+	igetch(1); // Cleanup input buffer
+
 	moveto(row, col);
 	prints(prompt);
 	prints(buffer);
 	iflush();
 
-	len = _str_input(buffer, buffer_length, echo_mode);
+	len = _str_input(buffer, buf_size, echo_mode);
 
 	return len;
 }
@@ -216,7 +217,7 @@ int display_file(const char *filename)
 {
 	char buffer[LINE_BUFFER_LEN];
 	FILE *fin;
-	int i;
+	size_t i;
 
 	if ((fin = fopen(filename, "r")) == NULL)
 	{
@@ -242,14 +243,16 @@ int display_file(const char *filename)
 
 int display_file_ex(const char *filename, int begin_line, int wait)
 {
+	static int show_help = 1;
 	char buffer[LINE_BUFFER_LEN];
 	int ch = 0;
 	int input_ok, line, max_lines;
-	long int c_line_current = 0, c_line_total = 0;
+	long int c_line_current = 0;
+	long int c_line_total = 0;
 	FILE *fin;
 	long *p_line_offsets;
-	int len;
-	int percentile;
+	long int len;
+	long int percentile;
 	int loop = 1;
 
 	if ((fin = fopen(filename, "r")) == NULL)
@@ -373,8 +376,15 @@ int display_file_ex(const char *filename
 				case '?':
 				case 'h':
 				case 'H':
+					if (!show_help)
+					{
+						break;
+					}
+
 					// Display help information
+					show_help = 0;
 					display_file_ex(DATA_READ_HELP, begin_line, 1);
+					show_help = 1;
 
 					// Refresh after display help information
 					c_line_current -= (line - 1);
@@ -398,7 +408,7 @@ int display_file_ex(const char *filename
 			log_error("Error length exceeds buffer size: %d\n", len);
 			len = LINE_BUFFER_LEN - 1;
 		}
-		if (fgets(buffer, len + 1, fin) == NULL)
+		if (fgets(buffer, (int)len + 1, fin) == NULL)
 		{
 			log_error("Reach EOF\n");
 			break;
@@ -420,7 +430,7 @@ int show_top(char *status)
 {
 	char buffer[LINE_BUFFER_LEN];
 
-	str_space(buffer, 20 - strlen(BBS_current_section_name));
+	str_space(buffer, 20 - (int)strnlen(BBS_current_section_name, sizeof(BBS_current_section_name)));
 
 	moveto(1, 0);
 	clrtoeol();
@@ -440,7 +450,7 @@ int show_bottom(char *msg)
 	struct tm *tm_online;
 
 	get_time_str(str_time, sizeof(str_time));
-	str_space(buffer, 33 - strlen(BBS_username));
+	str_space(buffer, 33 - (int)strnlen(BBS_username, sizeof(BBS_username)));
 
 	time_online = time(0) - BBS_login_tm;
 	tm_online = gmtime(&time_online);
@@ -463,7 +473,7 @@ int show_active_board()
 	char buffer[LINE_BUFFER_LEN];
 	FILE *fin;
 	static int line;
-	int len;
+	unsigned int len;
 	int end_of_line;
 
 	clrline(3, 2 + ACTIVE_BOARD_HEIGHT);