diff options
| -rw-r--r-- | src/stdio/__stdio_read.c | 10 | ||||
| -rw-r--r-- | src/stdio/__stdio_write.c | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c index ee17a576..c99ca9a9 100644 --- a/src/stdio/__stdio_read.c +++ b/src/stdio/__stdio_read.c @@ -15,9 +15,13 @@ size_t __stdio_read(FILE *f, unsigned char *buf, size_t len) }; ssize_t cnt; - pthread_cleanup_push(cleanup, f); - cnt = syscall_cp(SYS_readv, f->fd, iov, 2); - pthread_cleanup_pop(0); + if (libc.main_thread) { + pthread_cleanup_push(cleanup, f); + cnt = syscall_cp(SYS_readv, f->fd, iov, 2); + pthread_cleanup_pop(0); + } else { + cnt = syscall(SYS_readv, f->fd, iov, 2); + } if (cnt <= 0) { f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt); f->rpos = f->rend = 0; diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c index da45673f..cef7bbdc 100644 --- a/src/stdio/__stdio_write.c +++ b/src/stdio/__stdio_write.c @@ -18,9 +18,13 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len) int iovcnt = 2; ssize_t cnt; for (;;) { - pthread_cleanup_push(cleanup, f); - cnt = syscall_cp(SYS_writev, f->fd, iov, iovcnt); - pthread_cleanup_pop(0); + 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); + } if (cnt == rem) { f->wend = f->buf + f->buf_size; f->wpos = f->wbase = f->buf; |