RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibCore: Get the environment in Core::Process::spawn() on macOS

Browse source 
This is copied over from ladybird, but putting it here makes this
more reusable.
This commit is contained in:
MacDue 2023-03-24 21:55:23 +00:00 • committed by Linus Groh
parent 3feddbf9da
commit cd7459d608
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibCore/Process.cpp
View file

@ -21,7 +21,19 @@
# include <syscall.h> # include <syscall.h>
#endif #endif
extern char** environ; #if defined(AK_OS_MACOS)
# include <crt_externs.h>
#endif
static char** environment()
{
#if defined(AK_OS_MACOS)
return *_NSGetEnviron();
#else
extern char** environ;
return environ;
#endif
}
namespace Core { namespace Core {
@ -65,11 +77,11 @@ struct ArgvList {
if (!m_working_directory.is_empty()) if (!m_working_directory.is_empty())
posix_spawn_file_actions_addchdir(&spawn_actions, m_working_directory.characters()); posix_spawn_file_actions_addchdir(&spawn_actions, m_working_directory.characters());
auto pid = TRY(System::posix_spawn(m_path.view(), &spawn_actions, nullptr, const_cast<char**>(get().data()), environ)); auto pid = TRY(System::posix_spawn(m_path.view(), &spawn_actions, nullptr, const_cast<char**>(get().data()), environment()));
if (keep_as_child == Process::KeepAsChild::No) if (keep_as_child == Process::KeepAsChild::No)
TRY(System::disown(pid)); TRY(System::disown(pid));
#else #else
auto pid = TRY(System::posix_spawn(m_path.view(), nullptr, nullptr, const_cast<char**>(get().data()), environ)); auto pid = TRY(System::posix_spawn(m_path.view(), nullptr, nullptr, const_cast<char**>(get().data()), environment()));
// FIXME: Support keep_as_child outside Serenity. // FIXME: Support keep_as_child outside Serenity.
(void)keep_as_child; (void)keep_as_child;
#endif #endif