X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=11a017005fc09df08502833431506b2f4e51795f;hb=4106cdcd2de34bf3b9839e042344d92eae887ecb;hp=e6c2495af75aaf2205b07068d0eea6ee43e8511b;hpb=9fe28f703d44ff1ddecdca945bfb5fc87de5e8ad;p=oweals%2Fmusl.git

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index e6c2495a..11a01700 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -8,11 +8,19 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 	for (;;) {
 		if (a_fetch_add(sem->__val, -1) > 0) return 0;
 		val = a_fetch_add(sem->__val, 1)+1;
+		if (val==1) __wake(sem->__val, 1, 0);
+		if (at && at->tv_nsec >= 1000000000UL) {
+			errno = EINVAL;
+			return -1;
+		}
 		CANCELPT_BEGIN;
 		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
 			errno = ETIMEDOUT;
+			CANCELPT_TRY;
+			CANCELPT_END;
 			return -1;
 		}
+		CANCELPT_TRY;
 		CANCELPT_END;
 	}
 }