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

Commit 52ac8017 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Prevent duplicate signals from makeparallel" 

am: 70aac88a

Change-Id: Iade687bc2bfe56a357b0c8215b5f03cfdec2df9d
parents b98cde50 70aac88a

tools/makeparallel/makeparallel.cpp

+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");

  }