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

pls: Use Core::System::exec()

Browse source
This commit is contained in:
Sam Atkins 2022-03-12 20:58:50 +00:00 • committed by Andreas Kling
parent 3971f71235
commit d2b32924d6
1 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Utilities/pls.cpp
View file

@ -10,12 +10,11 @@
#include <LibCore/GetPassword.h> #include <LibCore/GetPassword.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
Vector<char const*> command; Vector<StringView> command;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
uid_t as_user_uid = 0; uid_t as_user_uid = 0;
args_parser.set_stop_on_first_non_option(true); args_parser.set_stop_on_first_non_option(true);
@ -46,23 +45,18 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio rpath exec")); TRY(Core::System::pledge("stdio rpath exec"));
Vector<char const*> exec_arguments; Vector<String> exec_environment_strings;
for (auto const& arg : command) Vector<StringView> exec_environment;
exec_arguments.append(arg); if (auto* term = getenv("TERM")) {
exec_arguments.append(nullptr); exec_environment_strings.append(String::formatted("TERM={}", term));
exec_environment.append(exec_environment_strings.last());
Vector<String> environment_strings;
if (auto* term = getenv("TERM"))
environment_strings.append(String::formatted("TERM={}", term));
Vector<char const*> exec_environment;
for (auto& item : environment_strings)
exec_environment.append(item.characters());
exec_environment.append(nullptr);
if (execvpe(command.at(0), const_cast<char**>(exec_arguments.data()), const_cast<char**>(exec_environment.data())) < 0) {
perror("execvpe");
exit(1);
} }
Vector<String> exec_arguments;
exec_arguments.ensure_capacity(command.size());
for (auto const& it : command)
exec_arguments.append(it.to_string());
TRY(Core::System::exec(command.at(0), command, Core::System::SearchInPath::Yes, exec_environment));
return 0; return 0;
} }