clean up handling of thread/nothread mode, locking

[musl] / src / stdio / ftrylockfile.c

diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 725b66e..0b0e44a 100644 (file)
--- a/src/stdio/ftrylockfile.c
+++ b/src/stdio/ftrylockfile.c
@@ -3,16 +3,15 @@
 
 int ftrylockfile(FILE *f)
 {
-       libc.lockfile = __lockfile;
-       if (f->owner && f->owner == pthread_self()->tid) {
+       int tid = pthread_self()->tid;
+       if (f->lock == tid) {
                if (f->lockcount == INT_MAX)
                        return -1;
                f->lockcount++;
                return 0;
        }
-       if (a_swap(&f->lock, 1))
+       if (f->lock || a_cas(&f->lock, 0, tid))
                return -1;
-       f->owner = pthread_self()->tid;
        f->lockcount = 1;
        return 0;
 }