--- lbbs/src/screen.c	2025/05/04 14:54:55	1.30
+++ lbbs/src/screen.c	2025/05/06 05:31:26	1.36
@@ -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.                                   *
  *                                                                         *
  ***************************************************************************/
@@ -126,9 +125,19 @@ static int _str_input(char *buffer, int
 		{
 			if (offset > 0)
 			{
-				buffer[--offset] = '\0';
-				prints("\b \b");
-				//            clrtoeol ();
+				offset--;
+				if (buffer[offset] < 0 || buffer[offset] > 127)
+				{
+					prints("\033[D \033[D");
+					offset--;
+					if (offset < 0) // should not happen
+					{
+						log_error("Offset of buffer is negative\n");
+						offset = 0;
+					}
+				}
+				buffer[offset] = '\0';
+				prints("\033[D \033[D");
 				iflush();
 			}
 			continue;
@@ -139,11 +148,19 @@ static int _str_input(char *buffer, int
 		}
 		if (c > 127 && c <= 255)
 		{
+			if (!hz && offset + 2 > buffer_length) // No enough space for Chinese character
+			{
+				igetch(1); // Cleanup remaining input
+				outc('\a');
+				iflush();
+				continue;
+			}
 			hz = (!hz);
 		}
 		if (offset >= buffer_length)
 		{
 			outc('\a');
+			iflush();
 			continue;
 		}
 		buffer[offset++] = (char)c;
@@ -163,27 +180,29 @@ static int _str_input(char *buffer, int
 		}
 	}
 
-	prints("\r\n");
-	iflush();
-
 	return offset;
 }
 
 int str_input(char *buffer, int buffer_length, int echo_mode)
 {
-	int offset;
+	int len;
 
-	memset(buffer, '\0', buffer_length);
+	buffer[0] = '\0';
 
-	offset = _str_input(buffer, buffer_length, echo_mode);
+	len = _str_input(buffer, buffer_length, echo_mode);
 
-	return offset;
+	prints("\r\n");
+	iflush();
+
+	return len;
 };
 
 int get_data(int row, int col, char *prompt, char *buffer, int buffer_length, int echo_mode)
 {
 	int len;
 
+	igetch(1); // Cleanup input buffer
+
 	moveto(row, col);
 	prints(prompt);
 	prints(buffer);
@@ -198,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)
 	{
@@ -227,11 +246,12 @@ int display_file_ex(const char *filename
 	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)
@@ -380,7 +400,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;
@@ -402,7 +422,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();
@@ -422,7 +442,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);
@@ -445,7 +465,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);