--- lbbs/src/user_info_display.c 2025/11/04 14:58:56 1.20 +++ lbbs/src/user_info_display.c 2025/12/19 06:16:27 1.26 @@ -6,6 +6,10 @@ * Copyright (C) 2004-2025 Leaflet */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "bbs.h" #include "ip_mask.h" #include "lml.h" @@ -20,8 +24,13 @@ #include #include -#define BBS_max_sessions_per_user 10 -#define LAST_LOGIN_DT_MAX_LEN 50 +enum _user_info_display_constant_t +{ + BBS_max_sessions_per_user = 10, + LAST_LOGIN_DT_MAX_LEN = 50, + ASTRO_STR_MAX_LEN = 64, + USER_INFO_MAX_LEN = 8192, +}; static int display_user_info_key_handler(int *p_key, DISPLAY_CTX *p_ctx) { @@ -34,7 +43,7 @@ int user_info_display(USER_INFO *p_user_ int session_cnt = BBS_max_sessions_per_user; int article_cnt; const char *astro_name; - char astro_str[LINE_BUFFER_LEN]; + char astro_str[ASTRO_STR_MAX_LEN]; struct tm tm_last_login; char str_last_login_dt[LAST_LOGIN_DT_MAX_LEN + 1]; struct tm tm_last_logout; @@ -48,7 +57,7 @@ int user_info_display(USER_INFO *p_user_ const char *user_level_name; char intro_f[BBS_user_intro_max_len + 1]; int intro_len; - char user_info_f[BUFSIZ]; + char user_info_f[USER_INFO_MAX_LEN]; long line_offsets[BBS_user_intro_max_line + 1]; long lines; char *p; @@ -58,7 +67,7 @@ int user_info_display(USER_INFO *p_user_ if (p_user_info == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } @@ -102,7 +111,7 @@ int user_info_display(USER_INFO *p_user_ ret = query_user_online_info_by_uid(p_user_info->uid, sessions, &session_cnt, 0); if (ret < 0) { - log_error("query_user_online_info_by_uid(uid=%d, cnt=%d) error: %d\n", + log_error("query_user_online_info_by_uid(uid=%d, cnt=%d) error: %d", p_user_info->uid, session_cnt, ret); session_cnt = 0; } @@ -116,7 +125,7 @@ int user_info_display(USER_INFO *p_user_ if (p + strlen(p_action_title) + 4 >= action_str + sizeof(action_str)) // buffer overflow { - log_error("action_str of user(uid=%d) truncated at i=%d\n", p_user_info->uid, i); + log_error("action_str of user(uid=%d) truncated at i=%d", p_user_info->uid, i); break; } *p++ = '['; @@ -166,11 +175,11 @@ int user_info_display(USER_INFO *p_user_ p_user_info->username, p_user_info->nickname, p_user_info->visit_count, article_cnt, str_last_login_dt, (session_cnt > 0 ? login_ip : "未知"), p_user_info->exp, (session_cnt > 0 ? "在线或因断线不详" : str_last_logout_dt), life, user_level_name, user_level + 1, astro_str, - (session_cnt > 0 ? "目前在线,状态如下:\n" : ""), (session_cnt > 0 ? action_str : ""), - (intro_len > 0 ? "\033[0;36m个人说明档如下:\033[m" : "\033[0;36m没有个人说明档\033[m"), + (session_cnt > 0 ? "目前在线,状态如下: \n" : ""), (session_cnt > 0 ? action_str : ""), + (intro_len > 0 ? "\033[0;36m个人说明档如下: \033[m" : "\033[0;36m没有个人说明档\033[m"), intro_f); - lines = split_data_lines(user_info_f, SCREEN_COLS + 1, line_offsets, MIN(SCREEN_ROWS - 1, BBS_user_intro_max_line + 8), 1, NULL); + lines = split_data_lines(user_info_f, SCREEN_COLS + 1, line_offsets, MIN(SCREEN_ROWS - 1, BBS_user_intro_max_line + 9), 1, NULL); clearscr(); display_data(user_info_f, lines, line_offsets, 1, display_user_info_key_handler, DATA_READ_HELP);