Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70aac88a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Prevent duplicate signals from makeparallel"

parents 9a3049d6 c6a900be
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ int main(int argc, char* argv[]) {

  static pid_t pid;

  // Set up signal handlers to forward SIGHUP, SIGINT, SIGQUIT, SIGTERM, and
  // SIGALRM to child
  // Set up signal handlers to forward SIGTERM to child
  // Assume that all other signals are sent to the entire process group
  struct sigaction action = {};
  action.sa_flags = SA_SIGINFO | SA_RESTART,
  action.sa_sigaction = [](int signal, siginfo_t*, void*) {
@@ -368,11 +368,7 @@ int main(int argc, char* argv[]) {
  };

  int ret = 0;
  if (!ret) ret = sigaction(SIGHUP, &action, NULL);
  if (!ret) ret = sigaction(SIGINT, &action, NULL);
  if (!ret) ret = sigaction(SIGQUIT, &action, NULL);
  if (!ret) ret = sigaction(SIGTERM, &action, NULL);
  if (!ret) ret = sigaction(SIGALRM, &action, NULL);
  if (ret < 0) {
    error(errno, errno, "sigaction failed");
  }