commit 2c3b2e12c15ac130bbfd806404dc735ed1ab8939
author Rom Lemarchand <romlem@google.com> Tue Jan 29 00:12:32 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 29 00:13:25 2013 +0000
tree 5a53aacfbdf6de3e8b5d13f43b6c2eadae1d16e5
parent 665118f502baa3d3acaf6aa50c3dd14fdc14779d
parent ed179d2f98c1628a593aec6d8408b621015f4de5

Merge "logwrap: Replace sigprocmask with pthread_sigmask"

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index ccb2c10..f6a96e0 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -76,7 +76,7 @@
 
     sigemptyset(&chldset);
     sigaddset(&chldset, SIGCHLD);
-    sigprocmask(SIG_UNBLOCK, &chldset, NULL);
+    pthread_sigmask(SIG_UNBLOCK, &chldset, NULL);
 
     while (!found_child) {
         if (poll(poll_fds, remote_hung ? 1 : 2, -1) < 0) {
@@ -215,7 +215,7 @@
     sigaddset(&blockset, SIGINT);
     sigaddset(&blockset, SIGQUIT);
     sigaddset(&blockset, SIGCHLD);
-    sigprocmask(SIG_BLOCK, &blockset, &oldset);
+    pthread_sigmask(SIG_BLOCK, &blockset, &oldset);
 
     pid = fork();
     if (pid < 0) {
@@ -223,7 +223,7 @@
         rc = -1;
         goto err_fork;
     } else if (pid == 0) {
-        sigprocmask(SIG_SETMASK, &oldset, NULL);
+        pthread_sigmask(SIG_SETMASK, &oldset, NULL);
         close(parent_ptty);
 
         child_ptty = open(child_devname, O_RDWR);
@@ -286,7 +286,7 @@
     }
     sigaction(SIGCHLD, &oldchldact, NULL);
 err_fork:
-    sigprocmask(SIG_SETMASK, &oldset, NULL);
+    pthread_sigmask(SIG_SETMASK, &oldset, NULL);
 err_ptty:
     close(parent_ptty);
 err_open: