httpd: fix return code when run in background

When httpd was run in the background the return code of the parent
process was incorrect.  It seems when spawn() is run in _P_DETACH
mode it returns 0 on success, not a process handle.

Fix the test for the return code and alter mingw_spawn_detach()
so it doesn't treat the return from spawn() as a handle.

Saves 32 bytes.

3 files changed, 7 insertions, 15 deletions

diff --git a/include/mingw.h b/include/mingw.h
index eab756184..46cbe03f8 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -549,7 +549,7 @@ int utimes(const char *file_name, const struct timeval times[2]);
 
 char ** FAST_FUNC grow_argv(char **argv, int n);
 pid_t FAST_FUNC mingw_spawn(char **argv);
-pid_t FAST_FUNC mingw_spawn_detach(char **argv);
+intptr_t FAST_FUNC mingw_spawn_detach(char **argv);
 intptr_t FAST_FUNC mingw_spawn_proc(const char **argv);
 int mingw_execv(const char *cmd, char *const *argv);
 int mingw_execvp(const char *cmd, char *const *argv);
diff --git a/networking/httpd.c b/networking/httpd.c
index 2b2d14076..0de56a47a 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2863,9 +2863,7 @@ static void mingw_daemonize(char **argv)
         xdup2(fd, 2);
         close(fd);
 
-        if (mingw_spawn_detach(new_argv))
-                exit_SUCCESS(); /* parent */
-        exit(EXIT_FAILURE); /* parent */
+        exit(mingw_spawn_detach(new_argv) == -1 ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 #endif
 
diff --git a/win32/process.c b/win32/process.c
index 54d98e1d9..a07ea06ed 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -333,26 +333,20 @@ mingw_spawnvp(int mode, const char *cmd, char *const *argv)
         return -1;
 }
 
-static pid_t
-mingw_spawn_pid(int mode, char **argv)
+pid_t FAST_FUNC
+mingw_spawn(char **argv)
 {
         intptr_t ret;
 
-        ret = mingw_spawnvp(mode, argv[0], (char *const *)argv);
+        ret = mingw_spawnvp(P_NOWAIT, argv[0], (char *const *)argv);
 
         return ret == -1 ? (pid_t)-1 : (pid_t)GetProcessId((HANDLE)ret);
 }
 
-pid_t FAST_FUNC
-mingw_spawn(char **argv)
-{
-        return mingw_spawn_pid(P_NOWAIT, argv);
-}
-
-pid_t FAST_FUNC
+intptr_t FAST_FUNC
 mingw_spawn_detach(char **argv)
 {
-        return mingw_spawn_pid(P_DETACH, argv);
+        return mingw_spawnvp(P_DETACH, argv[0], argv);
 }
 
 intptr_t FAST_FUNC