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

Userland+MenuApplets: Replace two more fork/exec with posix_spawn

Browse source
This commit is contained in:
Nico Weber 2020-07-05 10:01:05 -04:00 • committed by Andreas Kling
parent 131bc8fd31
commit 9cc32d6e95
2 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MenuApplets/Clock/main.cpp
View file

@ -31,6 +31,7 @@
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <spawn.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
@ -84,14 +85,10 @@ private:
if (event.button() != GUI::MouseButton::Left) if (event.button() != GUI::MouseButton::Left)
return; return;
pid_t pid = fork(); pid_t pid;
if (pid < 0) { const char* argv[] = { "Calendar", nullptr };
perror("fork"); if ((errno = posix_spawn(&pid, "/bin/Calendar", nullptr, nullptr, const_cast<char**>(argv), environ)))
} else if (pid == 0) { perror("posix_spawn");
execl("/bin/Calendar", "Calendar", nullptr);
perror("execl");
ASSERT_NOT_REACHED();
}
} }
void tick_clock() void tick_clock()

49
Userland/watch.cpp
View file

@ -29,6 +29,7 @@
#include <AK/Time.h> #include <AK/Time.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <spawn.h>
#include <stdio.h> #include <stdio.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -85,37 +86,29 @@ void handle_signal(int signal)
int run_command(const Vector<const char*>& command) int run_command(const Vector<const char*>& command)
{ {
child_pid = fork(); if ((errno = posix_spawnp(const_cast<pid_t*>(&child_pid), command[0], nullptr, nullptr, const_cast<char**>(command.data()), environ))) {
if (child_pid < 0) {
// We failed to fork, so we shall print an error message and update the exit code.
exit_code = 1; exit_code = 1;
perror("fork"); perror("posix_spawn");
return errno; return errno;
} else if (child_pid == 0) {
// We are in the child process, so we should run the command.
execvp(command[0], const_cast<char* const*>(command.data()));
perror("exec");
exit(1);
} else {
// We are still in the parent process, so we shall wait for the child to terminate,
// then return its exit code.
int status;
pid_t exited_pid;
do {
exited_pid = waitpid(child_pid, &status, 0);
} while (exited_pid < 0 && errno == EINTR);
ASSERT(exited_pid == child_pid);
child_pid = -1;
if (exited_pid < 0) {
perror("waitpid");
return 1;
}
if (WIFEXITED(status)) {
return WEXITSTATUS(status);
} else {
return 1;
}
} }
// Wait for the child to terminate, then return its exit code.
int status;
pid_t exited_pid;
do {
exited_pid = waitpid(child_pid, &status, 0);
} while (exited_pid < 0 && errno == EINTR);
ASSERT(exited_pid == child_pid);
child_pid = -1;
if (exited_pid < 0) {
perror("waitpid");
return 1;
}
if (WIFEXITED(status)) {
return WEXITSTATUS(status);
} else {
return 1;
}
} }
int main(int argc, char** argv) int main(int argc, char** argv)