--- lbbs/src/fork.c	2025/04/30 09:18:19	1.13
+++ lbbs/src/fork.c	2025/06/03 13:14:26	1.23
@@ -1,16 +1,15 @@
 /***************************************************************************
 						  fork.c  -  description
 							 -------------------
-	begin                : Mon Oct 18 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.                                   *
  *                                                                         *
  ***************************************************************************/
@@ -20,62 +19,75 @@
 #include "log.h"
 #include "io.h"
 #include "fork.h"
+#include "menu.h"
+#include <stdio.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <errno.h>
 
-int fork_server()
+int fork_server(void)
 {
 	int pid;
 
-	if (pid = fork())
+	pid = fork();
+
+	if (pid > 0) // Parent process
 	{
 		SYS_child_process_count++;
 		log_std("Child process (%d) start\n", pid);
-		return 0;
+		return pid;
 	}
-	else if (pid < 0)
+	else if (pid < 0) // Error
+	{
+		log_error("fork() error (%d)\n", errno);
 		return -1;
+	}
 
+	// Child process
 	if (close(socket_server) == -1)
 	{
 		log_error("Close server socket failed\n");
-		return -2;
 	}
 
 	// Redirect Input
-	close(0);
-	if (dup2(socket_client, 0) == -1)
+	close(STDIN_FILENO);
+	if (dup2(socket_client, STDIN_FILENO) == -1)
 	{
 		log_error("Redirect stdin to client socket failed\n");
-		return -3;
+		goto cleanup;
 	}
 
 	// Redirect Output
-	close(1);
-	if (dup2(socket_client, 1) == -1)
+	close(STDOUT_FILENO);
+	if (dup2(socket_client, STDOUT_FILENO) == -1)
 	{
 		log_error("Redirect stdout to client socket failed\n");
-		return -4;
+		goto cleanup;
 	}
 
+	SYS_child_process_count = 0;
+
 	bbs_main();
 
+cleanup:
+	// Child process exit
+	SYS_server_exit = 1;
+
 	if (close(socket_client) == -1)
 	{
 		log_error("Close client socket failed\n");
 	}
 
 	// Close Input and Output for client
-	close(0);
-	close(1);
+	close(STDIN_FILENO);
+	close(STDOUT_FILENO);
 
 	log_std("Process exit normally\n");
-
 	log_end();
 
-	// Exit child process normally
-	exit(0);
+	_exit(0);
 
 	return 0;
 }