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

LibCore: Add argument to specify working directory in Process::spawn

Browse source
This commit is contained in:
cflip 2022-10-15 19:04:18 -06:00 • committed by Linus Groh
parent 490c097bc4
commit 953520df49
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ namespace Core {
struct ArgvList { struct ArgvList {
String m_path; String m_path;
String m_working_directory;
Vector<char const*, 10> m_argv; Vector<char const*, 10> m_argv;
ArgvList(String path, size_t size) ArgvList(String path, size_t size)
@ -43,25 +44,38 @@ struct ArgvList {
return m_argv; return m_argv;
} }
void set_working_directory(String const& working_directory)
{
m_working_directory = working_directory;
}
ErrorOr<pid_t> spawn() ErrorOr<pid_t> spawn()
{ {
auto pid = TRY(System::posix_spawn(m_path.view(), nullptr, nullptr, const_cast<char**>(get().data()), environ));
#ifdef AK_OS_SERENITY #ifdef AK_OS_SERENITY
posix_spawn_file_actions_t spawn_actions;
posix_spawn_file_actions_init(&spawn_actions);
if (!m_working_directory.is_empty())
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));
TRY(System::disown(pid)); TRY(System::disown(pid));
#else
auto pid = TRY(System::posix_spawn(m_path.view(), nullptr, nullptr, const_cast<char**>(get().data()), environ));
#endif #endif
return pid; return pid;
} }
}; };
ErrorOr<pid_t> Process::spawn(StringView path, Span<String const> arguments) ErrorOr<pid_t> Process::spawn(StringView path, Span<String const> arguments, String working_directory)
{ {
ArgvList argv { path, arguments.size() }; ArgvList argv { path, arguments.size() };
for (auto const& arg : arguments) for (auto const& arg : arguments)
argv.append(arg.characters()); argv.append(arg.characters());
argv.set_working_directory(working_directory);
return argv.spawn(); return argv.spawn();
} }
ErrorOr<pid_t> Process::spawn(StringView path, Span<StringView const> arguments) ErrorOr<pid_t> Process::spawn(StringView path, Span<StringView const> arguments, String working_directory)
{ {
Vector<String> backing_strings; Vector<String> backing_strings;
backing_strings.ensure_capacity(arguments.size()); backing_strings.ensure_capacity(arguments.size());
@ -70,14 +84,16 @@ ErrorOr<pid_t> Process::spawn(StringView path, Span<StringView const> arguments)
backing_strings.append(arg); backing_strings.append(arg);
argv.append(backing_strings.last().characters()); argv.append(backing_strings.last().characters());
} }
argv.set_working_directory(working_directory);
return argv.spawn(); return argv.spawn();
} }
ErrorOr<pid_t> Process::spawn(StringView path, Span<char const* const> arguments) ErrorOr<pid_t> Process::spawn(StringView path, Span<char const* const> arguments, String working_directory)
{ {
ArgvList argv { path, arguments.size() }; ArgvList argv { path, arguments.size() };
for (auto arg : arguments) for (auto arg : arguments)
argv.append(arg); argv.append(arg);
argv.set_working_directory(working_directory);
return argv.spawn(); return argv.spawn();
} }

6
Userland/Libraries/LibCore/Process.h
View file

@ -14,9 +14,9 @@ namespace Core {
class Process { class Process {
public: public:
static ErrorOr<pid_t> spawn(StringView path, Span<String const> arguments); static ErrorOr<pid_t> spawn(StringView path, Span<String const> arguments, String working_directory = {});
static ErrorOr<pid_t> spawn(StringView path, Span<StringView const> arguments); static ErrorOr<pid_t> spawn(StringView path, Span<StringView const> arguments, String working_directory = {});
static ErrorOr<pid_t> spawn(StringView path, Span<char const* const> arguments = {}); static ErrorOr<pid_t> spawn(StringView path, Span<char const* const> arguments = {}, String working_directory = {});
}; };
} }