loader: Fix the generic case in get_self_exe().

Previously this just returned the matched directory, not the path to the executable itself. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

loader: Fix the generic case in get_self_exe().
a75596c9 · Martin Storsjo · Alexandre Julliard · 1721f0ff · a75596c9
Commit a75596c9 authored Aug 19, 2020 by Martin Storsjo Committed by Alexandre Julliard Aug 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

main.c loader/main.c +6 -4

No files found.
--- a/loader/main.c
+++ b/loader/main.c
@@ -216,13 +216,15 @@ static const char *get_self_exe( char *argv0 )
        for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" ))
        {
            char *name = build_path( p, argv0 );
-            int found = !access( name, X_OK );
+            if (!access( name, X_OK ))
+            {
+                free( path );
+                return name;
+            }
            free( name );
-            if (found) break;
        }
-        if (p) p = strdup( p );
        free( path );
-        return p;
+        return NULL;
    }
    return argv0;
 #endif