X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=11a017005fc09df08502833431506b2f4e51795f;hb=729cb49f52c825ac44f437e1ff0865d9f0b3626a;hp=e660436422de56957631f3feb2bee39a73b19690;hpb=6fc5fdbdc70dd17ea8e681a361fb4dae541ee953;p=musl

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index e6604364..11a01700 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -7,12 +7,20 @@ 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);
+		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;
 	}
 }