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

SystemServer: Use Core::Environment instead of Core::System::*env()

Browse source
This commit is contained in:
Sam Atkins 2024-01-30 16:15:09 +00:00 • committed by Sam Atkins
parent dd92c33498
commit f4e6f5c1cc
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Services/SystemServer/Service.cpp
View file

@ -13,6 +13,7 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/ConfigFile.h> #include <LibCore/ConfigFile.h>
#include <LibCore/Directory.h> #include <LibCore/Directory.h>
#include <LibCore/Environment.h>
#include <LibCore/SessionManagement.h> #include <LibCore/SessionManagement.h>
#include <LibCore/SocketAddress.h> #include <LibCore/SocketAddress.h>
#include <LibCore/System.h> #include <LibCore/System.h>
@ -137,7 +138,7 @@ ErrorOr<void> Service::change_privileges()
dbgln("Failed to drop privileges (tried to change to GID={}, UID={}), due to {}\n", account.gid(), account.uid(), error_or_void.error()); dbgln("Failed to drop privileges (tried to change to GID={}, UID={}), due to {}\n", account.gid(), account.uid(), error_or_void.error());
exit(1); exit(1);
} }
TRY(Core::System::setenv("HOME"sv, account.home_directory(), true)); TRY(Core::Environment::set("HOME"sv, account.home_directory(), Core::Environment::Overwrite::Yes));
} }
return {}; return {};
} }
@ -216,13 +217,13 @@ ErrorOr<void> Service::spawn(int socket_fd)
if (!m_sockets.is_empty()) { if (!m_sockets.is_empty()) {
// The new descriptor is !CLOEXEC here. // The new descriptor is !CLOEXEC here.
TRY(Core::System::setenv("SOCKET_TAKEOVER"sv, socket_takeover_builder.string_view(), true)); TRY(Core::Environment::set("SOCKET_TAKEOVER"sv, socket_takeover_builder.string_view(), Core::Environment::Overwrite::Yes));
} }
TRY(change_privileges()); TRY(change_privileges());
TRY(m_environment.view().for_each_split_view(' ', SplitBehavior::Nothing, [&](auto env) { TRY(m_environment.view().for_each_split_view(' ', SplitBehavior::Nothing, [&](auto env) {
return Core::System::putenv(env); return Core::Environment::put(env);
})); }));
Vector<StringView, 10> arguments; Vector<StringView, 10> arguments;