--- lbbs/src/main.c 2025/05/13 07:30:10 1.30 +++ lbbs/src/main.c 2025/05/25 08:15:03 1.41 @@ -21,6 +21,7 @@ #include "log.h" #include "io.h" #include "menu.h" +#include "file_loader.h" #include #include #include @@ -52,7 +53,6 @@ int main(int argc, char *argv[]) int daemon = 1; int std_log_redir = 0; int error_log_redir = 0; - int ret; // Parse args for (int i = 1; i < argc; i++) @@ -114,15 +114,7 @@ int main(int argc, char *argv[]) // Initialize daemon if (daemon) { - ret = init_daemon(); - if (ret > 0) // Parent process - { - return 0; - } - else if (ret < 0) // error - { - return ret; - } + init_daemon(); } // Change current dir @@ -153,26 +145,65 @@ int main(int argc, char *argv[]) return -2; } + // Initialize trie dict pool + if (trie_dict_init(CONF_BBSD, TRIE_NODE_PER_POOL) < 0) + { + printf("trie_dict_init failed\n"); + return -3; + } + + // Load BBS cmd + if (load_cmd() < 0) + { + return -3; + } + // Load menus - if (load_menu(&bbs_menu, CONF_MENU) < 0) + p_bbs_menu = calloc(1, sizeof(MENU_SET)); + if (p_bbs_menu == NULL) + { + log_error("OOM: calloc(MENU_SET)\n"); + return -3; + } + if (load_menu(p_bbs_menu, CONF_MENU) < 0) { - unload_menu(&bbs_menu); + unload_menu(p_bbs_menu); + free(p_bbs_menu); return -3; } + // Load data files + if (file_loader_init() < 0) + { + log_error("file_loader_init() error\n"); + return -4; + } + for (int i = 0; i < data_files_load_startup_count; i++) + { + if (load_file(data_files_load_startup[i]) < 0) + { + log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]); + } + } + // Set signal handler signal(SIGHUP, sig_hup_handler); signal(SIGCHLD, sig_chld_handler); signal(SIGTERM, sig_term_handler); // Initialize socket server - if (net_server(BBS_address, BBS_port) < 0) - { - return -4; - } + net_server(BBS_address, BBS_port); + + // Cleanup loaded data files + file_loader_cleanup(); + + // Cleanup menu + unload_menu(p_bbs_menu); + free(p_bbs_menu); + p_bbs_menu = NULL; - // Cleanup - unload_menu(&bbs_menu); + // Cleanup trie dict pool + trie_dict_cleanup(); log_std("Main process exit normally\n");