fix wide printf forms ignoring width for %lc format specifier

[musl] / src / thread / pthread_detach.c

diff --git a/src/thread/pthread_detach.c b/src/thread/pthread_detach.c
index 692bbaf..d73a500 100644 (file)
--- a/src/thread/pthread_detach.c
+++ b/src/thread/pthread_detach.c
@@ -1,15 +1,16 @@
 #include "pthread_impl.h"
 #include <threads.h>
 
-int __pthread_join(pthread_t, void **);
-
 static int __pthread_detach(pthread_t t)
 {
-       /* Cannot detach a thread that's already exiting */
-       if (a_cas(t->exitlock, 0, INT_MIN + 1))
-               return __pthread_join(t, 0);
-       t->detached = 2;
-       UNLOCK(t->exitlock);
+       /* If the cas fails, detach state is either already-detached
+        * or exiting/exited, and pthread_join will trap or cleanup. */
+       if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE) {
+               int cs;
+               __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+               __pthread_join(t, 0);
+               __pthread_setcancelstate(cs, 0);
+       }
        return 0;
 }