--- lbbs/src/fork.c 2025/05/13 07:41:55 1.18 +++ lbbs/src/fork.c 2025/06/04 13:42:53 1.24 @@ -19,6 +19,7 @@ #include "log.h" #include "io.h" #include "fork.h" +#include "menu.h" #include #include #include @@ -26,7 +27,7 @@ #include #include -int fork_server() +int fork_server(void) { int pid; @@ -35,8 +36,8 @@ int fork_server() if (pid > 0) // Parent process { SYS_child_process_count++; - log_std("Child process (%d) start\n", pid); - return 0; + log_common("Child process (%d) start\n", pid); + return pid; } else if (pid < 0) // Error { @@ -48,7 +49,6 @@ int fork_server() if (close(socket_server) == -1) { log_error("Close server socket failed\n"); - return -2; } // Redirect Input @@ -56,7 +56,7 @@ int fork_server() if (dup2(socket_client, STDIN_FILENO) == -1) { log_error("Redirect stdin to client socket failed\n"); - return -3; + goto cleanup; } // Redirect Output @@ -64,18 +64,14 @@ int fork_server() 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; - // Reset signal handler to default - signal(SIGHUP, SIG_DFL); - signal(SIGCHLD, SIG_DFL); - signal(SIGTERM, SIG_DFL); - bbs_main(); +cleanup: // Child process exit SYS_server_exit = 1; @@ -88,9 +84,10 @@ int fork_server() close(STDIN_FILENO); close(STDOUT_FILENO); - log_std("Process exit normally\n"); - + log_common("Process exit normally\n"); log_end(); + _exit(0); + return 0; }