--- lbbs/src/screen.c 2025/05/31 03:37:47 1.85 +++ lbbs/src/screen.c 2025/06/05 11:48:35 1.88 @@ -438,10 +438,16 @@ int display_data(const void *p_data, lon len = p_line_offsets[line_current + 1] - p_line_offsets[line_current]; if (len >= LINE_BUFFER_LEN) { - log_error("buffer overflow: len=%ld(%ld - %ld) line=%ld \n", + log_error("Buffer overflow: len=%ld(%ld - %ld) line=%ld \n", len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); len = LINE_BUFFER_LEN - 1; } + else if (len < 0) + { + log_error("Incorrect line offsets: len=%ld(%ld - %ld) line=%ld \n", + len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); + len = 0; + } memcpy(buffer, (const char *)p_data + p_line_offsets[line_current], (size_t)len); buffer[len] = '\0'; @@ -463,8 +469,8 @@ static int display_file_key_handler(int { case 0: // Set msg snprintf(p_ctx->msg, sizeof(p_ctx->msg), - "| 返回[\033[32m←\033[33m,\033[32mESC\033[33m] │ " - "移动[\033[32m↑\033[33m/\033[32m↓\033[33m/\033[32mPgUp\033[33m/\033[32mPgDn\033[33m] │ " + "| 返回[\033[32m←\033[33m,\033[32mESC\033[33m] | " + "移动[\033[32m↑\033[33m/\033[32m↓\033[33m/\033[32mPgUp\033[33m/\033[32mPgDn\033[33m] | " "帮助[\033[32mh\033[33m] |"); break; } @@ -541,6 +547,7 @@ int show_bottom(const char *msg) int msg_len; int len; int len_username; + char str_tm_online[LINE_BUFFER_LEN]; get_time_str(str_time, sizeof(str_time)); @@ -558,13 +565,23 @@ int show_bottom(const char *msg) time_online = time(0) - BBS_login_tm; tm_online = gmtime(&time_online); + if (tm_online->tm_mday > 1) + { + snprintf(str_tm_online, sizeof(str_tm_online), + "\033[36m%2d\033[33m天\033[36m%2d\033[33m时", + tm_online->tm_mday - 1, tm_online->tm_hour); + } + else + { + snprintf(str_tm_online, sizeof(str_tm_online), + "\033[36m%2d\033[33m时\033[36m%2d\033[33m分", + tm_online->tm_hour, tm_online->tm_min); + } moveto(SCREEN_ROWS, 0); clrtoeol(); - prints("\033[1;44;33m时间[\033[36m%s\033[33m]%s%*s \033[33m帐号[\033[36m%s\033[33m]" - "[\033[36m%1d\033[33m天\033[36m%2d\033[33m时\033[36m%2d\033[33m分]\033[m", - str_time, msg_f, 35 - msg_len - len_username, "", BBS_username, - tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); + prints("\033[1;44;33m时间[\033[36m%s\033[33m]%s%*s \033[33m帐号[\033[36m%s\033[33m][%s\033[33m]\033[m", + str_time, msg_f, 38 - msg_len - len_username, "", BBS_username, str_tm_online); return 0; }