[PATCH 1/1] ntdll: Use posix_spawn() to start the server.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/ntdll/unix/loader.c | 73 +++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index aa120ae38ec..a43c87f735c 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -30,6 +30,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <signal.h>
+#include <spawn.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -69,7 +70,6 @@
 # include <mach/mach_error.h>
 # include <mach-o/getsect.h>
 # include <crt_externs.h>
-# include <spawn.h>
 # ifndef _POSIX_SPAWN_DISABLE_ASLR
 #  define _POSIX_SPAWN_DISABLE_ASLR 0x0100
 # endif
@@ -77,6 +77,7 @@
 #ifdef __ANDROID__
 # include <jni.h>
 #endif
+extern char **environ;

#include "ntstatus.h"
 #define WIN32_NO_STATUS
@@ -546,47 +547,72 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i

/***********************************************************************
- *           exec_wineserver
+ *           spawn_wineserver
  *
- * Exec a new wine server.
+ * Spawn a new wine server.
  */
-static void exec_wineserver( char **argv )
+static int spawn_wineserver( pid_t *pid, char **argv )
 {
-    char *path;
+    char *path, *pathcopy;
+    int ret;

if (build_dir)
     {
         if (!is_win64)  /* look for 64-bit server */
         {
-            char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" ));
+            char *loader_relative = build_path( build_dir, "loader/wine64" );
+            char *loader = realpath_dirname( loader_relative );
+            free( loader_relative );
             if (loader)
             {
                 argv[0] = build_path( loader, "../server/wineserver" );
-                execv( argv[0], argv );
+                free( loader );
+                ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+                free( argv[0] );
+                if (!ret)
+                    return 0;
             }
         }
         argv[0] = build_path( build_dir, "server/wineserver" );
-        execv( argv[0], argv );
-        return;
+        ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+        free( argv[0] );
+        return ret;
     }

argv[0] = build_path( bin_dir, "wineserver" );
-    execv( argv[0], argv );
+    ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+    free( argv[0] );
+    if (!ret)
+        return 0;

argv[0] = getenv( "WINESERVER" );
-    if (argv[0]) execv( argv[0], argv );
+    if (argv[0])
+    {
+        ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+        if (!ret)
+            return 0;
+    }

-    if ((path = getenv( "PATH" )))
+    if ((pathcopy = getenv( "PATH" )) && ((pathcopy = strdup( pathcopy ))))
     {
-        for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" ))
+        for (path = strtok( pathcopy, ":" ); path; path = strtok( NULL, ":" ))
         {
             argv[0] = build_path( path, "wineserver" );
-            execvp( argv[0], argv );
+            ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+            free( argv[0] );
+            if (!ret)
+            {
+                free( pathcopy );
+                return 0;
+            }
         }
+        free( pathcopy );
     }

argv[0] = build_path( BINDIR, "wineserver" );
-    execv( argv[0], argv );
+    ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ );
+    free( argv[0] );
+    return ret;
 }

@@ -604,15 +630,14 @@ void start_server( BOOL debug )
     if (!started)
     {
         int status;
-        int pid = fork();
-        if (pid == -1) fatal_error( "fork: %s", strerror(errno) );
-        if (!pid)
-        {
-            argv[1] = debug ? debug_flag : NULL;
-            argv[2] = NULL;
-            exec_wineserver( argv );
-            fatal_error( "could not exec wineserver\n" );
-        }
+        pid_t pid;
+
+        argv[1] = debug ? debug_flag : NULL;
+        argv[2] = NULL;
+
+        status = spawn_wineserver( &pid, argv );
+        if (status) fatal_error( "could not spawn wineserver: %s", strerror(errno) );
+
         waitpid( pid, &status, 0 );
         status = WIFEXITED(status) ? WEXITSTATUS(status) : 1;
         if (status == 2) return;  /* server lock held by someone else, will retry later */