--- lbbs/src/main.c 2025/11/19 03:12:58 1.83 +++ lbbs/src/main.c 2025/12/19 14:08:44 1.91 @@ -16,6 +16,7 @@ #include "file_loader.h" #include "init.h" #include "io.h" +#include "lml.h" #include "log.h" #include "menu.h" #include "net_server.h" @@ -33,7 +34,7 @@ #include #include -static void app_help(void) +static inline void app_help(void) { fprintf(stderr, "Usage: bbsd [-fhv] [...]\n\n" "-f\t--foreground\t\tForce program run in foreground\n" @@ -41,15 +42,59 @@ static void app_help(void) "-v\t--version\t\tDisplay version information\n" "\t--display-log\t\tDisplay standard log information\n" "\t--display-error-log\tDisplay error log information\n" + "-C\t--compile-config\tDisplay compile configuration\n" "\n If meet any bug, please report to \n\n"); } -static void arg_error(void) +static inline void arg_error(void) { fprintf(stderr, "Invalid arguments\n"); app_help(); } +static inline void app_compile_info(void) +{ + printf("%s\n" + "--enable-shared\t\t[%s]\n" + "--enable-systemd\t[%s]\n" + "--with-debug\t\t[%s]\n" + "--with-epoll\t\t[%s]\n" + "--with-mariadb\t\t[%s]\n" + "--with-sysv\t\t[%s]\n", + APP_INFO, +#ifdef _ENABLE_SHARED + "yes", +#else + "no", +#endif +#ifdef HAVE_SYSTEMD_SD_DAEMON_H + "yes", +#else + "no", +#endif +#ifdef _DEBUG + "yes", +#else + "no", +#endif +#ifdef HAVE_SYS_EPOLL_H + "yes", +#else + "no", +#endif +#ifdef HAVE_MARIADB_CLIENT + "yes", +#else + "no", +#endif +#ifdef HAVE_SYSTEM_V + "yes" +#else + "no" +#endif + ); +} + int main(int argc, char *argv[]) { char file_path_temp[FILE_PATH_LEN]; @@ -62,6 +107,7 @@ int main(int argc, char *argv[]) struct sigaction act = {0}; int i; int j; + struct stat file_stat; // Parse args for (i = 1; i < argc; i++) @@ -85,6 +131,9 @@ int main(int argc, char *argv[]) printf("%s\n", APP_INFO); printf("%s\n", COPYRIGHT_INFO); return 0; + case 'C': + app_compile_info(); + return 0; default: arg_error(); return 1; @@ -117,6 +166,11 @@ int main(int argc, char *argv[]) { error_log_redir = 1; } + if (strcmp(argv[i] + 2, "compile-config") == 0) + { + app_compile_info(); + return 0; + } } break; } @@ -165,7 +219,7 @@ int main(int argc, char *argv[]) log_error_redir(STDERR_FILENO); } - log_common("Starting %s\n", APP_INFO); + log_common("Starting %s", APP_INFO); // Load configuration if (load_conf(CONF_BBSD) < 0) @@ -179,11 +233,19 @@ int main(int argc, char *argv[]) return -2; } + // Get EULA modification tm + if (stat(DATA_EULA, &file_stat) == -1) + { + log_error("stat(%s) error", DATA_EULA, errno); + goto cleanup; + } + BBS_eula_tm = file_stat.st_mtim.tv_sec; + // Check article cache dir ret = mkdir(VAR_ARTICLE_CACHE_DIR, 0750); if (ret == -1 && errno != EEXIST) { - log_error("mkdir(%s) error (%d)\n", VAR_ARTICLE_CACHE_DIR, errno); + log_error("mkdir(%s) error (%d)", VAR_ARTICLE_CACHE_DIR, errno); goto cleanup; } @@ -191,67 +253,75 @@ int main(int argc, char *argv[]) ret = mkdir(VAR_SECTION_AID_LOC_DIR, 0750); if (ret == -1 && errno != EEXIST) { - log_error("mkdir(%s) error (%d)\n", VAR_SECTION_AID_LOC_DIR, errno); + log_error("mkdir(%s) error (%d)", VAR_SECTION_AID_LOC_DIR, errno); goto cleanup; } // Initialize data pools if ((fp = fopen(VAR_ARTICLE_BLOCK_SHM, "w")) == NULL) { - log_error("fopen(%s) error\n", VAR_ARTICLE_BLOCK_SHM); + log_error("fopen(%s) error", VAR_ARTICLE_BLOCK_SHM); goto cleanup; } fclose(fp); if ((fp = fopen(VAR_SECTION_LIST_SHM, "w")) == NULL) { - log_error("fopen(%s) error\n", VAR_SECTION_LIST_SHM); + log_error("fopen(%s) error", VAR_SECTION_LIST_SHM); goto cleanup; } fclose(fp); if ((fp = fopen(VAR_TRIE_DICT_SHM, "w")) == NULL) { - log_error("fopen(%s) error\n", VAR_TRIE_DICT_SHM); + log_error("fopen(%s) error", 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); + log_error("fopen(%s) error", VAR_USER_LIST_SHM); goto cleanup; } fclose(fp); if (trie_dict_init(VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL) < 0) { - log_error("trie_dict_init(%s, %d) error\n", VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL); + log_error("trie_dict_init(%s, %d) error", VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL); goto cleanup; } if (article_block_init(VAR_ARTICLE_BLOCK_SHM, BBS_article_limit_per_section * BBS_max_section / BBS_article_count_per_block) < 0) { - log_error("article_block_init(%s, %d) error\n", VAR_ARTICLE_BLOCK_SHM, BBS_article_limit_per_section * BBS_max_section / BBS_article_count_per_block); + log_error("article_block_init(%s, %d) error", VAR_ARTICLE_BLOCK_SHM, BBS_article_limit_per_section * BBS_max_section / BBS_article_count_per_block); goto cleanup; } if (section_list_init(VAR_SECTION_LIST_SHM) < 0) { - log_error("section_list_pool_init(%s) error\n", VAR_SECTION_LIST_SHM); + log_error("section_list_pool_init(%s) error", VAR_SECTION_LIST_SHM); + goto cleanup; + } + + // Init LML module + if (lml_init() < 0) + { + log_error("lml_init() error"); goto cleanup; } // Load BBS cmd if (load_cmd() < 0) { + log_error("load_cmd() error"); goto cleanup; } // Load menus if (load_menu(&bbs_menu, CONF_MENU) < 0) { - log_error("load_menu(%s) error\n", CONF_MENU); + log_error("load_menu(bbs_menu) error"); goto cleanup; } if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0) { - log_error("load_menu(%s) error\n", CONF_TOP10_MENU); + log_error("load_menu(top10_menu) error"); goto cleanup; } top10_menu.allow_exit = 1; @@ -261,31 +331,31 @@ int main(int argc, char *argv[]) { if (load_file(data_files_load_startup[i]) < 0) { - log_error("load_file(%s) error\n", data_files_load_startup[i]); + log_error("load_file(%s) error", data_files_load_startup[i]); } } // Load user_list and online_user_list if (user_list_pool_init(VAR_USER_LIST_SHM) < 0) { - log_error("user_list_pool_init(%s) error\n", VAR_USER_LIST_SHM); + log_error("user_list_pool_init(%s) error", VAR_USER_LIST_SHM); goto cleanup; } if (user_list_pool_reload(0) < 0) { - log_error("user_list_pool_reload(all_user) error\n"); + log_error("user_list_pool_reload(all_user) error"); goto cleanup; } if (user_list_pool_reload(1) < 0) { - log_error("user_list_pool_reload(online_user) error\n"); + log_error("user_list_pool_reload(online_user) error"); goto cleanup; } // Load section config and gen_ex if (load_section_config_from_db(1) < 0) { - log_error("load_section_config_from_db(0) error\n"); + log_error("load_section_config_from_db(0) error"); goto cleanup; } @@ -297,18 +367,18 @@ int main(int argc, char *argv[]) { if ((ret = append_articles_from_db(last_aid + 1, 1, LOAD_ARTICLE_COUNT_LIMIT)) < 0) { - log_error("append_articles_from_db(0, 1, %d) error\n", LOAD_ARTICLE_COUNT_LIMIT); + log_error("append_articles_from_db(0, 1, %d) error", LOAD_ARTICLE_COUNT_LIMIT); goto cleanup; } last_aid = article_block_last_aid(); } while (ret == LOAD_ARTICLE_COUNT_LIMIT); - log_common("Initially load %d articles, last_aid = %d\n", article_block_article_count(), article_block_last_aid()); + log_common("Initially load %d articles, last_aid = %d", article_block_article_count(), article_block_last_aid()); if ((ret = user_stat_update()) < 0) { - log_error("user_stat_update() error\n"); + log_error("user_stat_update() error"); goto cleanup; } @@ -316,32 +386,38 @@ int main(int argc, char *argv[]) act.sa_handler = sig_hup_handler; if (sigaction(SIGHUP, &act, NULL) == -1) { - log_error("set signal action of SIGHUP error: %d\n", errno); + log_error("set signal action of SIGHUP error: %d", errno); goto cleanup; } act.sa_handler = sig_chld_handler; if (sigaction(SIGCHLD, &act, NULL) == -1) { - log_error("set signal action of SIGCHLD error: %d\n", errno); + log_error("set signal action of SIGCHLD error: %d", errno); goto cleanup; } act.sa_handler = sig_term_handler; if (sigaction(SIGTERM, &act, NULL) == -1) { - log_error("set signal action of SIGTERM error: %d\n", errno); + log_error("set signal action of SIGTERM error: %d", errno); + goto cleanup; + } + act.sa_handler = SIG_IGN; + if (sigaction(SIGPIPE, &act, NULL) == -1) + { + log_error("set signal action of SIGPIPE error: %d", errno); goto cleanup; } act.sa_handler = SIG_IGN; if (sigaction(SIGUSR1, &act, NULL) == -1) { - log_error("set signal action of SIGUSR1 error: %d\n", errno); + log_error("set signal action of SIGUSR1 error: %d", errno); goto cleanup; } // Launch section_list_loader process if (section_list_loader_launch() < 0) { - log_error("section_list_loader_launch() error\n"); + log_error("section_list_loader_launch() error"); goto cleanup; } @@ -353,27 +429,27 @@ cleanup: if (SYS_child_process_count > 0) { SYS_child_exit = 0; - + if (kill(section_list_loader_pid, SIGTERM) < 0) { - log_error("Send SIGTERM signal failed (%d)\n", errno); + log_error("Send SIGTERM signal failed (%d)", errno); } - for(i = 0; SYS_child_exit == 0 && i < 5; i++) + for (i = 0; SYS_child_exit == 0 && i < 5; i++) { sleep(1); // second } if ((ret = waitpid(section_list_loader_pid, NULL, WNOHANG)) < 0) { - log_error("waitpid(%d) error (%d)\n", section_list_loader_pid, errno); + log_error("waitpid(%d) error (%d)", section_list_loader_pid, errno); } else if (ret == 0) { - log_common("Force kill section_list_loader process (%d)\n", section_list_loader_pid); + log_common("Force kill section_list_loader process (%d)", section_list_loader_pid); if (kill(section_list_loader_pid, SIGKILL) < 0) { - log_error("Send SIGKILL signal failed (%d)\n", errno); + log_error("Send SIGKILL signal failed (%d)", errno); } } } @@ -383,7 +459,7 @@ cleanup: { if (unload_file(data_files_load_startup[i]) < 0) { - log_error("unload_file(%s) error\n", data_files_load_startup[i]); + log_error("unload_file(%s) error", data_files_load_startup[i]); } } @@ -391,33 +467,33 @@ cleanup: unload_menu(&bbs_menu); unload_menu(&top10_menu); + // Cleanup LML module + lml_cleanup(); + // Cleanup data pools section_list_cleanup(); article_block_cleanup(); trie_dict_cleanup(); user_list_pool_cleanup(); - // Cleanup BWF - bwf_unload(); - if (unlink(VAR_ARTICLE_BLOCK_SHM) < 0) { - log_error("unlink(%s) error\n", VAR_ARTICLE_BLOCK_SHM); + log_error("unlink(%s) error", VAR_ARTICLE_BLOCK_SHM); } if (unlink(VAR_SECTION_LIST_SHM) < 0) { - log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); + log_error("unlink(%s) error", VAR_SECTION_LIST_SHM); } if (unlink(VAR_TRIE_DICT_SHM) < 0) { - log_error("unlink(%s) error\n", VAR_TRIE_DICT_SHM); + log_error("unlink(%s) error", VAR_TRIE_DICT_SHM); } if (unlink(VAR_USER_LIST_SHM) < 0) { - log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); + log_error("unlink(%s) error", VAR_SECTION_LIST_SHM); } - log_common("Main process exit normally\n"); + log_common("Main process exit normally"); log_end();