--- lbbs/src/main.c	2025/06/17 01:24:21	1.52
+++ lbbs/src/main.c	2025/06/25 01:50:14	1.59
@@ -14,40 +14,39 @@
  *                                                                         *
  ***************************************************************************/
 
-#define _POSIX_C_SOURCE 200809L
-
 #include "bbs.h"
-#include "init.h"
 #include "common.h"
-#include "net_server.h"
-#include "log.h"
+#include "file_loader.h"
+#include "init.h"
 #include "io.h"
+#include "log.h"
 #include "menu.h"
-#include "file_loader.h"
+#include "net_server.h"
 #include "section_list_loader.h"
 #include <errno.h>
-#include <stdlib.h>
+#include <libgen.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <libgen.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
-void app_help(void)
+static void app_help(void)
 {
-	prints("Usage: bbsd [-fhv] [...]\n\n"
-		   "-f\t--foreground\t\tForce program run in foreground\n"
-		   "-h\t--help\t\t\tDisplay this help message\n"
-		   "-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"
-		   "\n    If meet any bug, please report to <leaflet@leafok.com>\n\n");
+	fprintf(stderr, "Usage: bbsd [-fhv] [...]\n\n"
+					"-f\t--foreground\t\tForce program run in foreground\n"
+					"-h\t--help\t\t\tDisplay this help message\n"
+					"-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"
+					"\n    If meet any bug, please report to <leaflet@leafok.com>\n\n");
 }
 
-void arg_error(void)
+static void arg_error(void)
 {
-	prints("Invalid arguments\n");
+	fprintf(stderr, "Invalid arguments\n");
 	app_help();
 }
 
@@ -81,7 +80,7 @@ int main(int argc, char *argv[])
 						app_help();
 						return 0;
 					case 'v':
-						puts(APP_NAME_VER);
+						puts(APP_INFO);
 						return 0;
 					default:
 						arg_error();
@@ -103,7 +102,7 @@ int main(int argc, char *argv[])
 				}
 				if (strcmp(argv[i] + 2, "version") == 0)
 				{
-					puts(APP_NAME_VER);
+					puts(APP_INFO);
 					return 0;
 				}
 				if (strcmp(argv[i] + 2, "display-log") == 0)
@@ -147,7 +146,7 @@ int main(int argc, char *argv[])
 		log_error_redir(STDERR_FILENO);
 	}
 
-	log_common("BBS Server (%s) is staring...\n", APP_NAME_VER);
+	log_common("Starting %s\n", APP_INFO);
 
 	// Load configuration
 	if (load_conf(CONF_BBSD) < 0)
@@ -206,13 +205,7 @@ int main(int argc, char *argv[])
 	}
 
 	// Load menus
-	p_bbs_menu = calloc(1, sizeof(MENU_SET));
-	if (p_bbs_menu == NULL)
-	{
-		log_error("OOM: calloc(MENU_SET)\n");
-		goto cleanup;
-	}
-	if (load_menu(p_bbs_menu, CONF_MENU) < 0)
+	if (load_menu(&bbs_menu, CONF_MENU) < 0)
 	{
 		goto cleanup;
 	}
@@ -232,7 +225,7 @@ int main(int argc, char *argv[])
 	}
 
 	// Load section config
-	if (load_section_config_from_db() < 0)
+	if (load_section_config_from_db(0) < 0)
 	{
 		log_error("load_section_config_from_db() error\n");
 		goto cleanup;
@@ -290,9 +283,7 @@ cleanup:
 	file_loader_cleanup();
 
 	// Cleanup menu
-	unload_menu(p_bbs_menu);
-	free(p_bbs_menu);
-	p_bbs_menu = NULL;
+	unload_menu(&bbs_menu);
 
 	// Cleanup data pools
 	section_list_cleanup();
@@ -314,5 +305,7 @@ cleanup:
 
 	log_common("Main process exit normally\n");
 
+	log_end();
+
 	return 0;
 }