remove LFS64 symbol aliases; replace with dynamic linker remapping

[musl] / src / stdio / __stdio_write.c

diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c
index e52e91a..d2d8947 100644 (file)
--- a/src/stdio/__stdio_write.c
+++ b/src/stdio/__stdio_write.c
@@ -1,12 +1,5 @@
 #include "stdio_impl.h"
 #include <sys/uio.h>
-#include <pthread.h>
-
-static void cleanup(void *p)
-{
-       FILE *f = p;
-       if (!f->lockcount) __unlockfile(f);
-}
 
 size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len)
 {
@@ -19,13 +12,7 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len)
        int iovcnt = 2;
        ssize_t cnt;
        for (;;) {
-               if (libc.main_thread) {
-                       pthread_cleanup_push(cleanup, f);
-                       cnt = syscall_cp(SYS_writev, f->fd, iov, iovcnt);
-                       pthread_cleanup_pop(0);
-               } else {
-                       cnt = syscall(SYS_writev, f->fd, iov, iovcnt);
-               }
+               cnt = syscall(SYS_writev, f->fd, iov, iovcnt);
                if (cnt == rem) {
                        f->wend = f->buf + f->buf_size;
                        f->wpos = f->wbase = f->buf;
@@ -38,11 +25,8 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len)
                }
                rem -= cnt;
                if (cnt > iov[0].iov_len) {
-                       f->wpos = f->wbase = f->buf;
                        cnt -= iov[0].iov_len;
                        iov++; iovcnt--;
-               } else if (iovcnt == 2) {
-                       f->wbase += cnt;
                }
                iov[0].iov_base = (char *)iov[0].iov_base + cnt;
                iov[0].iov_len -= cnt;