Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use execvpe to execute zenity and kdialog #234

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use execvpe to execute zenity and kdialog #234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions vstgui/lib/platform/linux/x11fileselector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// distribution and at http://github.com/steinbergmedia/vstgui/LICENSE

#include "x11fileselector.h"
#include "../../vstguibase.h"
#include <unistd.h>
#include <sys/wait.h>
#include <sys/types.h>
Expand All @@ -18,13 +19,19 @@ extern "C" { extern char **environ; }
namespace VSTGUI {
namespace X11 {

#if LINUX
// Use execvpe on Linux to support also NixOS based distributions
static constexpr auto kdialogpath = "kdialog";
static constexpr auto zenitypath = "zenity";
#else
static constexpr auto kdialogpath = "/usr/bin/kdialog";
static constexpr auto zenitypath = "/usr/bin/zenity";
#endif

//------------------------------------------------------------------------
struct FileSelector : IPlatformFileSelector
{
FileSelector (PlatformFileSelectorStyle style) : style (style) { identifiyExDialogType (); }
FileSelector (PlatformFileSelectorStyle style) : style (style) {}

~FileSelector () noexcept { closeProcess (); }

Expand All @@ -36,15 +43,12 @@ struct FileSelector : IPlatformFileSelector

bool runDialog (const PlatformFileSelectorConfig& config)
{
switch (exDialogType)
{
case ExDialogType::kdialog:
return runKDialog (config);
case ExDialogType::zenity:
return runZenity (config);
case ExDialogType::none:
break;
}
if (runZenity (config))
return true;

if (runKDialog (config))
return true;

return false;
}

Expand Down Expand Up @@ -89,14 +93,6 @@ struct FileSelector : IPlatformFileSelector
zenity
};

void identifiyExDialogType ()
{
if (access (zenitypath, X_OK) != -1)
exDialogType = ExDialogType::zenity;
if (access (kdialogpath, X_OK) != -1)
exDialogType = ExDialogType::kdialog;
}

bool runKDialog (const PlatformFileSelectorConfig& config)
{
std::vector<std::string> args;
Expand Down Expand Up @@ -199,7 +195,9 @@ struct FileSelector : IPlatformFileSelector
return false;

if (forkPid == 0) {
execute (argv, envp, rw.fd);
if (!execute (argv, envp, rw.fd))
return false;

assert (false);
}

Expand All @@ -213,15 +211,21 @@ struct FileSelector : IPlatformFileSelector
return true;
}

[[noreturn]]
static void execute (char* argv[], char* envp[], const int pipeFd[2])
static bool execute (char* argv[], char* envp[], const int pipeFd[2])
{
close (pipeFd[0]);
if (dup2 (pipeFd[1], STDOUT_FILENO) == -1)
_exit (1);
close (pipeFd[1]);
execve (argv[0], argv, envp);
#if LINUX
if (execvpe (argv[0], argv, envp) == -1)
#else
if (execve (argv[0], argv, envp) == -1)
#endif
return false;

_exit (1);
return true; // not reachable
}

void closeProcess ()
Expand Down