X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Faio%2Flio_listio.c;h=0799c15d8b16f362eb3f5d5b813c23f124c214a2;hb=0847902ab99065a48f9bd3729b6e676288dfd69e;hp=532b17cebeddc233cba138e653839522a32e043f;hpb=b427c822655156f17d17cd00110ff5bc22299a38;p=musl

diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c
index 532b17ce..0799c15d 100644
--- a/src/aio/lio_listio.c
+++ b/src/aio/lio_listio.c
@@ -1,6 +1,5 @@
 #include <aio.h>
 #include <errno.h>
-#include <limits.h>
 #include <unistd.h>
 #include <string.h>
 #include "pthread_impl.h"
@@ -13,7 +12,7 @@ struct lio_state {
 
 static int lio_wait(struct lio_state *st)
 {
-	int i, err, got_err;
+	int i, err, got_err = 0;
 	int cnt = st->cnt;
 	struct aiocb **cbs = st->cbs;
 
@@ -44,7 +43,7 @@ static void notify_signal(struct sigevent *sev)
 		.si_signo = sev->sigev_signo,
 		.si_value = sev->sigev_value,
 		.si_code = SI_ASYNCIO,
-		.si_pid = __pthread_self()->pid,
+		.si_pid = getpid(),
 		.si_uid = getuid()
 	};
 	__syscall(SYS_rt_sigqueueinfo, si.si_pid, si.si_signo, &si);
@@ -109,12 +108,12 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
 	if (mode == LIO_WAIT) {
 		ret = lio_wait(st);
 		free(st);
-		return 0;
+		return ret;
 	}
 
 	if (st) {
 		pthread_attr_t a;
-		sigset_t set;
+		sigset_t set, set_old;
 		pthread_t td;
 
 		if (sev->sigev_notify == SIGEV_THREAD) {
@@ -129,15 +128,16 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
 		}
 		pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
 		sigfillset(&set);
-		pthread_sigmask(SIG_BLOCK, &set, &set);
+		pthread_sigmask(SIG_BLOCK, &set, &set_old);
 		if (pthread_create(&td, &a, wait_thread, st)) {
 			free(st);
 			errno = EAGAIN;
 			return -1;
 		}
-		pthread_sigmask(SIG_SETMASK, &set, 0);
+		pthread_sigmask(SIG_SETMASK, &set_old, 0);
 	}
 
 	return 0;
 }
 
+weak_alias(lio_listio, lio_listio64);