--- lbbs/src/main.c	2025/05/05 11:11:06	1.22
+++ lbbs/src/main.c	2025/05/13 07:30:10	1.30
@@ -1,16 +1,15 @@
 /***************************************************************************
 						  main.c  -  description
 							 -------------------
-	begin                : Mon Oct 11 2004
-	copyright            : (C) 2004 by Leaflet
-	email                : leaflet@leafok.com
+	Copyright            : (C) 2004-2025 by Leaflet
+	Email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
+ *   the Free Software Foundation; either version 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
@@ -53,6 +52,7 @@ int main(int argc, char *argv[])
 	int daemon = 1;
 	int std_log_redir = 0;
 	int error_log_redir = 0;
+	int ret;
 
 	// Parse args
 	for (int i = 1; i < argc; i++)
@@ -71,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;
 					}
 				}
 			}
@@ -91,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)
 				{
@@ -114,7 +114,15 @@ int main(int argc, char *argv[])
 	// Initialize daemon
 	if (daemon)
 	{
-		init_daemon();
+		ret = init_daemon();
+		if (ret > 0) // Parent process
+		{
+			return 0;
+		}
+		else if (ret < 0) // error
+		{
+			return ret;
+		}
 	}
 
 	// Change current dir
@@ -127,42 +135,46 @@ 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 menus
-	if (load_menu(&bbs_menu, "conf/menu.conf") < 0)
-		exit(-3);
+	if (load_menu(&bbs_menu, CONF_MENU) < 0)
+	{
+		unload_menu(&bbs_menu);
+		return -3;
+	}
 
 	// 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)
+	if (net_server(BBS_address, BBS_port) < 0)
 	{
-		sleep(1);
+		return -4;
 	}
 
 	// Cleanup
 	unload_menu(&bbs_menu);
 
+	log_std("Main process exit normally\n");
+	
 	return 0;
 }