filter: use sigpending/sigismember/sigwait instead of sigtimedwait

sigtimedwait is just POSIX.1-2001, which lesser operating systems don't
implement completely.
pull/28/head
Leah Neukirchen 7 years ago
parent b78cf918db
commit 9e49cf7561

@ -15,7 +15,6 @@ filter(char *input, size_t inlen, char *cmd, char **outputo, size_t *outleno)
ssize_t outalloc = 4096;
pid_t pid;
sigset_t mask, orig_mask;
struct timespec immediately = { 0, 0 };
sigemptyset(&mask);
sigaddset(&mask, SIGPIPE);
@ -105,7 +104,11 @@ filter(char *input, size_t inlen, char *cmd, char **outputo, size_t *outleno)
*outputo = output;
*outleno = outlen;
sigtimedwait(&mask, 0, &immediately);
sigpending(&mask);
if (sigismember(&mask, SIGPIPE)) {
int sig;
sigwait(&mask, &sig);
}
sigprocmask(SIG_SETMASK, &orig_mask, 0);
return WEXITSTATUS(status);
@ -115,7 +118,11 @@ fail:
*outleno = 0;
free(output);
sigtimedwait(&mask, 0, &immediately);
sigpending(&mask);
if (sigismember(&mask, SIGPIPE)) {
int sig;
sigwait(&mask, &sig);
}
sigprocmask(SIG_SETMASK, &orig_mask, 0);
return -1;

Loading…
Cancel
Save