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

Terminal: Use LibCore syscall wrapper for ptsname()

Browse source
This commit is contained in:
Andreas Kling 2021-11-24 23:25:03 +01:00
parent 748c8b4879
commit 1749442a1c
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Applications/Terminal/main.cpp
View file

@ -47,10 +47,8 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
static void utmp_update(const char* tty, pid_t pid, bool create) static void utmp_update(String const& tty, pid_t pid, bool create)
{ {
if (!tty)
return;
int utmpupdate_pid = fork(); int utmpupdate_pid = fork();
if (utmpupdate_pid < 0) { if (utmpupdate_pid < 0) {
perror("fork"); perror("fork");
@ -62,7 +60,7 @@ static void utmp_update(const char* tty, pid_t pid, bool create)
// including the heap! So resort to low-level APIs // including the heap! So resort to low-level APIs
char pid_str[32]; char pid_str[32];
snprintf(pid_str, sizeof(pid_str), "%d", pid); snprintf(pid_str, sizeof(pid_str), "%d", pid);
execl("/bin/utmpupdate", "/bin/utmpupdate", "-f", "Terminal", "-p", pid_str, (create ? "-c" : "-d"), tty, nullptr); execl("/bin/utmpupdate", "/bin/utmpupdate", "-f", "Terminal", "-p", pid_str, (create ? "-c" : "-d"), tty.characters(), nullptr);
} else { } else {
wait_again: wait_again:
int status = 0; int status = 0;
@ -296,8 +294,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
auto* pts_name = ptsname(ptm_fd); auto ptsname = TRY(Core::System::ptsname(ptm_fd));
utmp_update(pts_name, shell_pid, true); utmp_update(ptsname, shell_pid, true);
auto app_icon = GUI::Icon::default_icon("app-terminal"); auto app_icon = GUI::Icon::default_icon("app-terminal");
@ -431,6 +429,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->show(); window->show();
int result = app->exec(); int result = app->exec();
dbgln("Exiting terminal, updating utmp"); dbgln("Exiting terminal, updating utmp");
utmp_update(pts_name, 0, false); utmp_update(ptsname, 0, false);
return result; return result;
} }