--- lbbs/src/main.c 2025/11/04 13:49:51 1.69 +++ lbbs/src/main.c 2025/11/17 12:47:41 1.78 @@ -3,10 +3,15 @@ * main * - entry of server program * - * Copyright (C) 2004-2025 by Leaflet + * Copyright (C) 2004-2025 Leaflet */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "bbs.h" +#include "bwf.h" #include "common.h" #include "file_loader.h" #include "init.h" @@ -18,6 +23,7 @@ #include "user_list.h" #include #include +#include #include #include #include @@ -73,7 +79,8 @@ int main(int argc, char *argv[]) app_help(); return 0; case 'v': - puts(APP_INFO); + printf("%s\n", APP_INFO); + printf("%s\n", COPYRIGHT_INFO); return 0; default: arg_error(); @@ -95,7 +102,8 @@ int main(int argc, char *argv[]) } if (strcmp(argv[i] + 2, "version") == 0) { - puts(APP_INFO); + printf("%s\n", APP_INFO); + printf("%s\n", COPYRIGHT_INFO); return 0; } if (strcmp(argv[i] + 2, "display-log") == 0) @@ -131,6 +139,20 @@ int main(int argc, char *argv[]) fprintf(stderr, "chdir(..) error: %d\n", errno); return -1; } +#if defined(__MSYS__) || defined(__MINGW32__) + if (chdir("..") < 0) + { + fprintf(stderr, "chdir(..) error: %d\n", errno); + return -1; + } +#endif + + // Apply the specified locale + if (setlocale(LC_ALL, "en_US.UTF-8") == NULL) + { + fprintf(stderr, "setlocale(LC_ALL, en_US.UTF-8) error\n"); + return -1; + } // Initialize log if (log_begin(LOG_FILE_INFO, LOG_FILE_ERROR) < 0) @@ -155,6 +177,12 @@ int main(int argc, char *argv[]) return -2; } + // Load BWF config + if (bwf_load(CONF_BWF) < 0) + { + return -2; + } + // Check article cache dir ret = mkdir(VAR_ARTICLE_CACHE_DIR, 0750); if (ret == -1 && errno != EEXIST) @@ -199,12 +227,12 @@ int main(int argc, char *argv[]) if (trie_dict_init(VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL) < 0) { - printf("trie_dict_init(%s, %d) error\n", VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL); + log_error("trie_dict_init(%s, %d) error\n", 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 / ARTICLE_PER_BLOCK) < 0) + 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 / ARTICLE_PER_BLOCK); + 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); goto cleanup; } if (section_list_init(VAR_SECTION_LIST_SHM) < 0) @@ -312,6 +340,12 @@ int main(int argc, char *argv[]) log_error("set signal action of SIGTERM error: %d\n", 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); + goto cleanup; + } // Launch section_list_loader process if (section_list_loader_launch() < 0) @@ -337,6 +371,9 @@ 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);