--- lbbs/src/screen.c 2025/05/10 13:17:36 1.42 +++ lbbs/src/screen.c 2025/05/11 11:33:44 1.45 @@ -112,22 +112,22 @@ static int _str_input(char *buffer, int for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) ; - while ((c = igetch_t(MIN(MAX_DELAY_TIME, 60)))) + while (!SYS_server_exit && (c = igetch_t(MIN(MAX_DELAY_TIME, 60)))) { if (c == CR) { igetch(1); // Cleanup remaining '\n' in the buffer break; } - if (c == KEY_TIMEOUT) + else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe { return -1; } - if (c == KEY_NULL || c == LF) + else if (c == LF || c == '\0') { continue; } - if (c == BACKSPACE) + else if (c == BACKSPACE) { if (offset > 0) { @@ -148,11 +148,11 @@ static int _str_input(char *buffer, int } continue; } - if (c > 255 || iscntrl(c)) + else if (c > 255 || iscntrl(c)) { continue; } - if (c > 127 && c <= 255) + else if (c > 127 && c <= 255) { if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character { @@ -163,14 +163,17 @@ static int _str_input(char *buffer, int } hz = (!hz); } + if (offset + 1 > buf_size - 1) { outc('\a'); iflush(); continue; } + buffer[offset++] = (char)c; buffer[offset] = '\0'; + switch (echo_mode) { case DOECHO: @@ -275,7 +278,7 @@ int display_file_ex(const char *filename line = begin_line; max_lines = screen_rows - 1; - while (loop) + while (!SYS_server_exit && loop) { if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2) { @@ -310,13 +313,12 @@ int display_file_ex(const char *filename iflush(); input_ok = 0; - while (!input_ok) + while (!SYS_server_exit && !input_ok) { ch = igetch_t(MAX_DELAY_TIME); input_ok = 1; switch (ch) { - case KEY_NULL: case KEY_TIMEOUT: goto cleanup; case KEY_UP: