X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdio%2Fftrylockfile.c;h=eef4e2502e56af1a6ed1f8d9a08f898bab5ce856;hp=1d0a1ff8662baad6ce8593348c4179530b70ca4e;hb=1d92cddb1e1ed4b6cc0e55461727561e7a2522e0;hpb=4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6

diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 1d0a1ff8..eef4e250 100644
--- a/src/stdio/ftrylockfile.c
+++ b/src/stdio/ftrylockfile.c
@@ -1,18 +1,19 @@
 #include "stdio_impl.h"
 #include "pthread_impl.h"
+#include <limits.h>
 
 int ftrylockfile(FILE *f)
 {
-	if (!libc.lockfile) libc.lockfile = __lockfile;
-	if (f->owner && f->owner == pthread_self()->tid) {
-		if (f->lockcount == INT_MAX)
+	int tid = pthread_self()->tid;
+	if (f->lock == tid) {
+		if (f->lockcount == LONG_MAX)
 			return -1;
 		f->lockcount++;
 		return 0;
 	}
-	if (a_swap(&f->lock, 1))
+	if (f->lock < 0) f->lock = 0;
+	if (f->lock || a_cas(&f->lock, 0, tid))
 		return -1;
-	f->owner = pthread_self()->tid;
 	f->lockcount = 1;
 	return 0;
 }