Fix in WAIT-UNTIL-FD-READY: on EINTR the timeout is recalculated before calling again...