--- lbbs/src/main.c 2025/06/25 01:50:14 1.59 +++ lbbs/src/main.c 2025/10/23 01:16:56 1.64 @@ -23,6 +23,7 @@ #include "menu.h" #include "net_server.h" #include "section_list_loader.h" +#include "user_list.h" #include #include #include @@ -128,8 +129,16 @@ int main(int argc, char *argv[]) strncpy(file_path_temp, argv[0], sizeof(file_path_temp) - 1); file_path_temp[sizeof(file_path_temp) - 1] = '\0'; - chdir(dirname(file_path_temp)); - chdir(".."); + if (chdir(dirname(file_path_temp)) < 0) + { + fprintf(stderr, "chdir(%s) error: %d\n", dirname(file_path_temp), errno); + return -1; + } + if (chdir("..") < 0) + { + fprintf(stderr, "chdir(..) error: %d\n", errno); + return -1; + } // Initialize log if (log_begin(LOG_FILE_INFO, LOG_FILE_ERROR) < 0) @@ -163,12 +172,6 @@ int main(int argc, char *argv[]) } // Initialize data pools - if ((fp = fopen(VAR_TRIE_DICT_SHM, "w")) == NULL) - { - log_error("fopen(%s) error\n", VAR_TRIE_DICT_SHM); - goto cleanup; - } - fclose(fp); if ((fp = fopen(VAR_ARTICLE_BLOCK_SHM, "w")) == NULL) { log_error("fopen(%s) error\n", VAR_ARTICLE_BLOCK_SHM); @@ -181,6 +184,18 @@ int main(int argc, char *argv[]) goto cleanup; } fclose(fp); + if ((fp = fopen(VAR_TRIE_DICT_SHM, "w")) == NULL) + { + log_error("fopen(%s) error\n", VAR_TRIE_DICT_SHM); + goto cleanup; + } + fclose(fp); + if ((fp = fopen(VAR_USER_LIST_SHM, "w")) == NULL) + { + log_error("fopen(%s) error\n", VAR_USER_LIST_SHM); + goto cleanup; + } + fclose(fp); if (trie_dict_init(VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL) < 0) { @@ -207,8 +222,15 @@ int main(int argc, char *argv[]) // Load menus if (load_menu(&bbs_menu, CONF_MENU) < 0) { + log_error("load_menu(%s) error\n", CONF_MENU); + goto cleanup; + } + if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0) + { + log_error("load_menu(%s) error\n", CONF_TOP10_MENU); goto cleanup; } + top10_menu.allow_exit = 1; // Load data files if (file_loader_init() < 0) @@ -224,10 +246,27 @@ int main(int argc, char *argv[]) } } - // Load section config - if (load_section_config_from_db(0) < 0) + // Load user_list and online_user_list + if (user_list_pool_init() < 0) + { + log_error("user_list_pool_init() error\n"); + goto cleanup; + } + if (user_list_pool_reload(0) < 0) + { + log_error("user_list_pool_reload(all_user) error\n"); + goto cleanup; + } + if (user_list_pool_reload(1) < 0) + { + log_error("user_list_pool_reload(online_user) error\n"); + goto cleanup; + } + + // Load section config and gen_ex + if (load_section_config_from_db(1) < 0) { - log_error("load_section_config_from_db() error\n"); + log_error("load_section_config_from_db(0) error\n"); goto cleanup; } @@ -284,16 +323,14 @@ cleanup: // Cleanup menu unload_menu(&bbs_menu); + unload_menu(&top10_menu); // Cleanup data pools section_list_cleanup(); article_block_cleanup(); trie_dict_cleanup(); + user_list_pool_cleanup(); - if (unlink(VAR_TRIE_DICT_SHM) < 0) - { - log_error("unlink(%s) error\n", VAR_TRIE_DICT_SHM); - } if (unlink(VAR_ARTICLE_BLOCK_SHM) < 0) { log_error("unlink(%s) error\n", VAR_ARTICLE_BLOCK_SHM); @@ -302,6 +339,14 @@ cleanup: { log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); } + if (unlink(VAR_TRIE_DICT_SHM) < 0) + { + log_error("unlink(%s) error\n", VAR_TRIE_DICT_SHM); + } + if (unlink(VAR_USER_LIST_SHM) < 0) + { + log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); + } log_common("Main process exit normally\n");