[PATCH v3 1/2] ntdll: Factor out generating possible paths to wineserver.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/ntdll/unix/loader.c | 91 +++++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 28 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index aa120ae38ec..c184a2d5c4a 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -546,47 +546,80 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i

/***********************************************************************
- *           exec_wineserver
+ *           next_wineserver_path
  *
- * Exec a new wine server.
+ * Return possible paths to the server.
  */
-static void exec_wineserver( char **argv )
+static char *next_wineserver_path( char **pathcopy )
 {
-    char *path;
+    static int step = 0;

-    if (build_dir)
+    switch (step)
     {
-        if (!is_win64)  /* look for 64-bit server */
+    case 0:
+        if (build_dir && !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 );
+                char *ret = build_path( loader, "../server/wineserver" );
+                free( loader );
+                step = 1;
+                return ret;
             }
         }
-        argv[0] = build_path( build_dir, "server/wineserver" );
-        execv( argv[0], argv );
-        return;
-    }
-
-    argv[0] = build_path( bin_dir, "wineserver" );
-    execv( argv[0], argv );
-
-    argv[0] = getenv( "WINESERVER" );
-    if (argv[0]) execv( argv[0], argv );
+        /* fallthrough */
+    case 1:
+        if (build_dir)
+        {
+            step = 2;
+            return build_path( build_dir, "server/wineserver" );
+        }
+        /* fallthrough */
+    case 2:
+        if (build_dir)
+            return NULL;
+        /* fallthrough */
+    case 3:
+        step = 4;
+        return build_path( bin_dir, "wineserver" );
+    case 4:
+        if (getenv( "WINESERVER" ))
+        {
+            step = 5;
+            return strdup( getenv( "WINESERVER" ) );
+        }
+        /* fallthrough */
+    case 5:
+        if (getenv( "PATH" ))
+            *pathcopy = strdup( getenv( "PATH" ) );

-    if ((path = getenv( "PATH" )))
-    {
-        for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" ))
+        step = 6;
+        if (*pathcopy)
         {
-            argv[0] = build_path( path, "wineserver" );
-            execvp( argv[0], argv );
+            char *path = strtok( *pathcopy, ":" );
+            if (path)
+                return build_path( path, "wineserver" );
+        }
+        /* fallthrough */
+    case 6:
+        if (*pathcopy)
+        {
+            char *path = strtok( NULL, ":" );
+            if (path)
+                return build_path( path, "wineserver" );
+            else
+                step = 7;
         }
+        /* fallthrough */
+    case 7:
+        step = 8;
+        return build_path( BINDIR, "wineserver" );
+    default:
+        return NULL;
     }
-
-    argv[0] = build_path( BINDIR, "wineserver" );
-    execv( argv[0], argv );
 }

@@ -604,13 +637,15 @@ void start_server( BOOL debug )
     if (!started)
     {
         int status;
+        char *pathcopy = NULL;
         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 );
+            while ((argv[0] = next_wineserver_path( &pathcopy )))
+                execv( argv[0], argv );
             fatal_error( "could not exec wineserver\n" );
         }
         waitpid( pid, &status, 0 );