--- lbbs/src/main.c 2025/05/07 05:35:01 1.24 +++ lbbs/src/main.c 2025/05/18 03:23:57 1.37 @@ -21,6 +21,7 @@ #include "log.h" #include "io.h" #include "menu.h" +#include "file_loader.h" #include #include #include @@ -70,13 +71,13 @@ int main(int argc, char *argv[]) break; case 'h': app_help(); - exit(0); + return 0; case 'v': puts(app_version); - exit(0); + return 0; default: arg_error(); - exit(1); + return 1; } } } @@ -90,12 +91,12 @@ int main(int argc, char *argv[]) if (strcmp(argv[i] + 2, "help") == 0) { app_help(); - exit(0); + return 0; } if (strcmp(argv[i] + 2, "version") == 0) { puts(app_version); - exit(0); + return 0; } if (strcmp(argv[i] + 2, "display-log") == 0) { @@ -126,45 +127,76 @@ int main(int argc, char *argv[]) // Initialize log if (log_begin(LOG_FILE_INFO, LOG_FILE_ERROR) < 0) { - exit(-1); + return -1; } if ((!daemon) && std_log_redir) { - log_std_redirect(2); + log_std_redirect(STDERR_FILENO); } if ((!daemon) && error_log_redir) { - log_err_redirect(3); + log_err_redirect(STDERR_FILENO); } // Load configuration - if (load_conf("conf/bbsd.conf") < 0) - exit(-2); + if (load_conf(CONF_BBSD) < 0) + { + return -2; + } + + // Load BBS cmd + if (load_cmd() < 0) + { + return -3; + } // Load menus - if (load_menu(&bbs_menu, "conf/menu.conf") < 0) - exit(-3); + 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(p_bbs_menu); + free(p_bbs_menu); + return -3; + } + // unload_menu_shm(p_bbs_menu); + + // 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_shm(data_files_load_startup[i]) < 0) + { + log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]); + } + } // Set signal handler - signal(SIGCHLD, child_exit); - signal(SIGTERM, system_exit); - signal(SIG_RELOAD_MENU, reload_bbs_menu); + signal(SIGHUP, sig_hup_handler); + signal(SIGCHLD, sig_chld_handler); + signal(SIGTERM, sig_term_handler); // Initialize socket server net_server(BBS_address, BBS_port); - // Wait for child process exit - while (SYS_child_process_count > 0) - { - log_std("Waiting for %d child process to exit\n", SYS_child_process_count); - sleep(1); - } - - // Cleanup - unload_menu(&bbs_menu); + // Cleanup loaded data files + file_loader_cleanup(); + + // Cleanup menu + unload_menu(p_bbs_menu); + free(p_bbs_menu); + p_bbs_menu = NULL; - log_std("Main process exit\n"); + log_std("Main process exit normally\n"); return 0; }