--- lbbs/src/fork.c	2005/03/20 17:37:14	1.10
+++ lbbs/src/fork.c	2025/05/13 07:41:55	1.18
@@ -1,75 +1,96 @@
 /***************************************************************************
-                          fork.c  -  description
-                             -------------------
-    begin                : Mon Oct 18 2004
-    copyright            : (C) 2004 by Leaflet
-    email                : leaflet@leafok.com
+						  fork.c  -  description
+							 -------------------
+	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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "common.h"
+#include "bbs_main.h"
+#include "log.h"
 #include "io.h"
+#include "fork.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()
 {
-  int pid;
+	int pid;
 
-  if (pid = fork ())
-    return 0;
-  else if (pid < 0)
-    return -1;
-
-  log_std ("Child process start\n");
-
-  if (close (socket_server) == -1)
-    {
-      log_error ("Close server socket failed\n");
-      return -2;
-    }
-
-  //Redirect Input
-  close (0);
-  if (dup2 (socket_client, 0) == -1)
-    {
-      log_error ("Redirect stdin to client socket failed\n");
-      return -3;
-    }
-
-  //Redirect Output
-  close (1);
-  if (dup2 (socket_client, 1) == -1)
-    {
-      log_error ("Redirect stdout to client socket failed\n");
-      return -4;
-    }
-
-  bbs_main ();
-
-  if (close (socket_client) == -1)
-    {
-      log_error ("Close client socket failed\n");
-    }
-
-  log_std ("Child process exit\n");
-
-  //Close Input and Output for client
-  close (0);
-  close (1);
+	pid = fork();
 
-  log_end ();
+	if (pid > 0) // Parent process
+	{
+		SYS_child_process_count++;
+		log_std("Child process (%d) start\n", pid);
+		return 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(STDIN_FILENO);
+	if (dup2(socket_client, STDIN_FILENO) == -1)
+	{
+		log_error("Redirect stdin to client socket failed\n");
+		return -3;
+	}
+
+	// Redirect Output
+	close(STDOUT_FILENO);
+	if (dup2(socket_client, STDOUT_FILENO) == -1)
+	{
+		log_error("Redirect stdout to client socket failed\n");
+		return -4;
+	}
+
+	SYS_child_process_count = 0;
+
+	// Reset signal handler to default
+	signal(SIGHUP, SIG_DFL);
+	signal(SIGCHLD, SIG_DFL);
+	signal(SIGTERM, SIG_DFL);
+	
+	bbs_main();
+
+	// 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(STDIN_FILENO);
+	close(STDOUT_FILENO);
 
-  //Exit child process normally
-  exit (0);
+	log_std("Process exit normally\n");
 
-  return 0;
+	log_end();
+
+	return 0;
 }