projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix swprintf handling of nul character in output
[musl]
/
src
/
stdio
/
__stdio_read.c
diff --git
a/src/stdio/__stdio_read.c
b/src/stdio/__stdio_read.c
index
ee17a57
..
ea675da
100644
(file)
--- a/
src/stdio/__stdio_read.c
+++ b/
src/stdio/__stdio_read.c
@@
-1,11
+1,5
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
-#include <pthread.h>
-
-static void cleanup(void *p)
-{
- FILE *f = p;
- if (!f->lockcount) __unlockfile(f);
-}
+#include <sys/uio.h>
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
{
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
{
@@
-15,13
+9,11
@@
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
};
ssize_t cnt;
};
ssize_t cnt;
- pthread_cleanup_push(cleanup, f);
- cnt = syscall_cp(SYS_readv, f->fd, iov, 2);
- pthread_cleanup_pop(0);
+ cnt = iov[0].iov_len ? syscall(SYS_readv, f->fd, iov, 2)
+ : syscall(SYS_read, f->fd, iov[1].iov_base, iov[1].iov_len);
if (cnt <= 0) {
if (cnt <= 0) {
- f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
- f->rpos = f->rend = 0;
- return cnt;
+ f->flags |= cnt ? F_ERR : F_EOF;
+ return 0;
}
if (cnt <= iov[0].iov_len) return cnt;
cnt -= iov[0].iov_len;
}
if (cnt <= iov[0].iov_len) return cnt;
cnt -= iov[0].iov_len;