rewrite popen to use posix_spawn instead of fragile vfork hacks

[musl] / src / stdio / ftrylockfile.c

diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 725b66e..eef4e25 100644 (file)
--- 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)
 {
-       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;
 }