From ff82238172190a9601bc5df71aa1df0992e155a5 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 7 Dec 2024 16:41:29 +0100 Subject: [PATCH] dialog/unix: remove /usr/bin/env indirection SDL process is using `posix_spawnp` which already does the path lookup so additional indirection via `env` is unnecessary --- src/dialog/unix/SDL_zenitydialog.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/dialog/unix/SDL_zenitydialog.c b/src/dialog/unix/SDL_zenitydialog.c index 41d5bacb7a..866d8833ce 100644 --- a/src/dialog/unix/SDL_zenitydialog.c +++ b/src/dialog/unix/SDL_zenitydialog.c @@ -82,7 +82,7 @@ char *zenity_clean_name(const char *name) /* Exec call format: * - * /usr/bin/env zenity --file-selection --separator=\n [--multiple] + * zenity --file-selection --separator=\n [--multiple] * [--directory] [--save --confirm-overwrite] * [--filename FILENAME] [--modal --attach 0x11w1nd0w] * [--title TITLE] [--ok-label ACCEPT] @@ -91,7 +91,7 @@ char *zenity_clean_name(const char *name) */ static char** generate_args(const zenityArgs* info) { - int argc = 4; + int argc = 3; int nextarg = 0; char **argv = NULL; @@ -143,8 +143,6 @@ static char** generate_args(const zenityArgs* info) } // ARGV PASS - argv[nextarg++] = SDL_strdup("/usr/bin/env"); - CHECK_OOM() argv[nextarg++] = SDL_strdup("zenity"); CHECK_OOM() argv[nextarg++] = SDL_strdup("--file-selection"); @@ -401,7 +399,7 @@ void SDL_Zenity_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_Dialog bool SDL_Zenity_detect(void) { const char *args[] = { - "/usr/bin/env", "zenity", "--version", NULL + "zenity", "--version", NULL }; int status = -1;