projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change uid_t, gid_t, and id_t to unsigned types
[musl]
/
src
/
stdio
/
__stdio_read.c
diff --git
a/src/stdio/__stdio_read.c
b/src/stdio/__stdio_read.c
index
218bd88
..
05e56f9
100644
(file)
--- a/
src/stdio/__stdio_read.c
+++ b/
src/stdio/__stdio_read.c
@@
-1,4
+1,12
@@
#include "stdio_impl.h"
#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_read(FILE *f, unsigned char *buf, size_t len)
{
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
{
@@
-8,7
+16,13
@@
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
};
ssize_t cnt;
};
ssize_t cnt;
- cnt = syscall(SYS_readv, f->fd, iov, 2);
+ 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;
if (cnt <= 0) {
f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
f->rpos = f->rend = 0;