diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstddjb/iopause_select.c | 4 | ||||
| -rw-r--r-- | src/sysdeps/tryselectinfinite.c (renamed from src/sysdeps/tryselectshorttimeout.c) | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/libstddjb/iopause_select.c b/src/libstddjb/iopause_select.c index 863bea7..45ce19e 100644 --- a/src/libstddjb/iopause_select.c +++ b/src/libstddjb/iopause_select.c @@ -30,10 +30,10 @@ int iopause_select (iopause_fd *x, unsigned int len, tain const *deadline, tain if (errno != EOVERFLOW) return -1 ; else deadline = 0 ; } -#ifdef SKALIBS_HASSELECTSHORTTIMEOUT +#ifndef SKALIBS_HASSELECTINFINITE if (deadline && tv.tv_sec >= 100000000) { - tv.tv_sec = 99999999 ; + tv.tv_sec = 100000000 ; tv.tv_usec = 0 ; } #endif diff --git a/src/sysdeps/tryselectshorttimeout.c b/src/sysdeps/tryselectinfinite.c index 9049079..83b2c06 100644 --- a/src/sysdeps/tryselectshorttimeout.c +++ b/src/sysdeps/tryselectinfinite.c @@ -17,18 +17,19 @@ #include <sys/time.h> #include <sys/select.h> #include <unistd.h> +#include <errno.h> #include <signal.h> static void alrm_handler (int sig) { (void)sig ; - _exit(1) ; + _exit(0) ; } int main (void) { - struct sigaction action = { .sa_handler = &alrm_handler, .sa_flags = SA_NOCLDSTOP | SA_RESTART } ; - struct timeval tv = { .tv_sec = 100000000, .tv_usec = 0 } ; + struct sigaction action = { .sa_handler = &alrm_handler, .sa_flags = SA_NOCLDSTOP } ; + struct timeval tv = { .tv_sec = 100000001, .tv_usec = 0 } ; fd_set r, w, x ; FD_ZERO(&r) ; FD_ZERO(&w) ; @@ -36,6 +37,6 @@ int main (void) sigfillset(&action.sa_mask) ; if (sigaction(SIGALRM, &action, 0) == -1) _exit(111) ; alarm(1) ; - if (select(1, &r, &w, &x, &tv) == -1) _exit(errno == EINVAL ? 0 : 111) ; - _exit(1) ; + select(1, &r, &w, &x, &tv) ; + _exit(errno == EINVAL ? 1 : 111) ; } |
