lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

sigwait: Do not fail with EINTR and return error code [BZ #22478]

Browse Source 
Since

commit 8b0e795aaa
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed Nov 1 11:49:05 2017 -0200

    Simplify Linux sig{timed}wait{info} implementations

sigwait can fail with EINTR.  Applications do not expect that, and the
error code is not documented in POSIX or the manual pages.

This commit restores the previous behavior by retrying the system call
on EINTR.  It also returns the error code, not -1, on the remaing
errors.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer
2017-11-23 11:20:53 +01:00
parent 59d2cbb1fe
commit cccb6d4e87
4 changed files with 104 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sysdeps/unix/sysv/linux/sigwait.c
View File

@ -17,13 +17,20 @@
#include <signal.h>
#include <sysdep-cancel.h>
#include <errno.h>
int
__sigwait (const sigset_t *set, int *sig)
{
siginfo_t si;
if (__sigtimedwait (set, &si, 0) < 0)
return -1;
int ret;
do
ret = __sigtimedwait (set, &si, 0);
/* Applications do not expect sigwait to return with EINTR, and the
error code is not specified by POSIX. */
while (ret < 0 && errno == EINTR);
if (ret < 0)
return errno;
*sig = si.si_signo;
return 0;
}