--- lbbs/src/fork.c 2025/05/15 05:14:57 1.19 +++ lbbs/src/fork.c 2025/06/03 13:14:26 1.23 @@ -27,7 +27,7 @@ #include #include -int fork_server() +int fork_server(void) { int pid; @@ -37,7 +37,7 @@ int fork_server() { SYS_child_process_count++; log_std("Child process (%d) start\n", pid); - return 0; + return pid; } else if (pid < 0) // Error { @@ -49,7 +49,6 @@ int fork_server() if (close(socket_server) == -1) { log_error("Close server socket failed\n"); - return -2; } // Redirect Input @@ -57,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 @@ -65,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; @@ -89,15 +84,10 @@ int fork_server() close(STDIN_FILENO); close(STDOUT_FILENO); - // Unload menu - unload_menu_shm(p_bbs_menu); - free(p_bbs_menu); - p_bbs_menu = NULL; - log_std("Process exit normally\n"); log_end(); _exit(0); - + return 0; }