--- lbbs/src/main.c	2025/11/05 03:01:14	1.71
+++ lbbs/src/main.c	2025/11/19 03:12:58	1.83
@@ -6,7 +6,12 @@
  * Copyright (C) 2004-2025  Leaflet <leaflet@leafok.com>
  */
 
+#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 <errno.h>
 #include <libgen.h>
+#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,6 +31,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 
 static void app_help(void)
 {
@@ -53,16 +60,18 @@ int main(int argc, char *argv[])
 	int ret;
 	int last_aid;
 	struct sigaction act = {0};
+	int i;
+	int j;
 
 	// Parse args
-	for (int i = 1; i < argc; i++)
+	for (i = 1; i < argc; i++)
 	{
 		switch (argv[i][0])
 		{
 		case '-':
 			if (argv[i][1] != '-')
 			{
-				for (int j = 1; j < strlen(argv[i]); j++)
+				for (j = 1; j < strlen(argv[i]); j++)
 				{
 					switch (argv[i][j])
 					{
@@ -73,7 +82,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 +105,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)
@@ -132,6 +143,13 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
+	// 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 +173,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,7 +223,7 @@ 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 / BBS_article_count_per_block) < 0)
@@ -233,11 +257,6 @@ int main(int argc, char *argv[])
 	top10_menu.allow_exit = 1;
 
 	// Load data files
-	if (file_loader_init() < 0)
-	{
-		log_error("file_loader_init() error\n");
-		goto cleanup;
-	}
 	for (int i = 0; i < data_files_load_startup_count; i++)
 	{
 		if (load_file(data_files_load_startup[i]) < 0)
@@ -312,6 +331,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)
@@ -324,8 +349,43 @@ int main(int argc, char *argv[])
 	net_server(BBS_address, BBS_port);
 
 cleanup:
+	// Cleanup loader process if still running
+	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);
+		}
+
+		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);
+		}
+		else if (ret == 0)
+		{
+			log_common("Force kill section_list_loader process (%d)\n", section_list_loader_pid);
+			if (kill(section_list_loader_pid, SIGKILL) < 0)
+			{
+				log_error("Send SIGKILL signal failed (%d)\n", errno);
+			}
+		}
+	}
+
 	// Cleanup loaded data files
-	file_loader_cleanup();
+	for (int i = 0; i < data_files_load_startup_count; i++)
+	{
+		if (unload_file(data_files_load_startup[i]) < 0)
+		{
+			log_error("unload_file(%s) error\n", data_files_load_startup[i]);
+		}
+	}
 
 	// Cleanup menu
 	unload_menu(&bbs_menu);
@@ -337,6 +397,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);