Compare commits
No commits in common. "e7d361ca51e765f7999341a672534c5796fc45ef" and "4cc8a44ec79994024a17954bc7cbb42fa8720685" have entirely different histories.
e7d361ca51
...
4cc8a44ec7
@ -136,7 +136,6 @@ namespace os
|
|||||||
~LocalServer();
|
~LocalServer();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
StringView m_path;
|
|
||||||
int m_fd;
|
int m_fd;
|
||||||
bool m_blocking;
|
bool m_blocking;
|
||||||
};
|
};
|
||||||
|
@ -43,7 +43,6 @@ namespace os
|
|||||||
fcntl(sockfd, F_SETFD, FD_CLOEXEC);
|
fcntl(sockfd, F_SETFD, FD_CLOEXEC);
|
||||||
|
|
||||||
server->m_fd = sockfd;
|
server->m_fd = sockfd;
|
||||||
server->m_path = path;
|
|
||||||
return server;
|
return server;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,7 +63,6 @@ namespace os
|
|||||||
LocalServer::~LocalServer()
|
LocalServer::~LocalServer()
|
||||||
{
|
{
|
||||||
close(m_fd);
|
close(m_fd);
|
||||||
os::FileSystem::remove(m_path);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalServer::Client::Client(Client&& other) : m_fd(other.m_fd)
|
LocalServer::Client::Client(Client&& other) : m_fd(other.m_fd)
|
||||||
|
@ -95,8 +95,6 @@ Result<int> luna_main(int argc, char** argv)
|
|||||||
setsid();
|
setsid();
|
||||||
|
|
||||||
// First of all, start the display server, in case we haven't been started by loginui.
|
// First of all, start the display server, in case we haven't been started by loginui.
|
||||||
// FIXME: What if we're started after a wind process has previously run but exited, so we think there's a wind
|
|
||||||
// process when there isn't.
|
|
||||||
if (!os::FileSystem::exists("/tmp/wind.sock"))
|
if (!os::FileSystem::exists("/tmp/wind.sock"))
|
||||||
{
|
{
|
||||||
// We need to wait for this one, since its sockets are required later.
|
// We need to wait for this one, since its sockets are required later.
|
||||||
@ -123,7 +121,6 @@ Result<int> luna_main(int argc, char** argv)
|
|||||||
// We also need to wait for this one, since taskbar requires launch.sock.
|
// We also need to wait for this one, since taskbar requires launch.sock.
|
||||||
bool success = os::IPC::Notifier::run_and_wait(
|
bool success = os::IPC::Notifier::run_and_wait(
|
||||||
[&] {
|
[&] {
|
||||||
(void)os::FileSystem::remove("/tmp/launch.sock");
|
|
||||||
StringView launch_command[] = { "/usr/bin/launch" };
|
StringView launch_command[] = { "/usr/bin/launch" };
|
||||||
spawn_process_as_user(Slice<StringView>(launch_command, 1), pw->pw_uid, pw->pw_gid, groups.slice());
|
spawn_process_as_user(Slice<StringView>(launch_command, 1), pw->pw_uid, pw->pw_gid, groups.slice());
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user