projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert COPYRIGHT file changes in preparation to merge nsz's math branch
[musl]
/
src
/
stdio
/
__stdio_read.c
diff --git
a/src/stdio/__stdio_read.c
b/src/stdio/__stdio_read.c
index
a2e4cd6
..
ee17a57
100644
(file)
--- a/
src/stdio/__stdio_read.c
+++ b/
src/stdio/__stdio_read.c
@@
-1,22
+1,32
@@
#include "stdio_impl.h"
#include "stdio_impl.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)
{
struct iovec iov[2] = {
size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
{
struct iovec iov[2] = {
- { .iov_base = buf, .iov_len = len },
+ { .iov_base = buf, .iov_len = len
- !!f->buf_size
},
{ .iov_base = f->buf, .iov_len = f->buf_size }
};
ssize_t cnt;
{ .iov_base = f->buf, .iov_len = f->buf_size }
};
ssize_t cnt;
- cnt = syscall(SYS_readv, f->fd, iov, 2);
+ pthread_cleanup_push(cleanup, f);
+ cnt = syscall_cp(SYS_readv, f->fd, iov, 2);
+ pthread_cleanup_pop(0);
if (cnt <= 0) {
f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
f->rpos = f->rend = 0;
return cnt;
}
if (cnt <= 0) {
f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
f->rpos = f->rend = 0;
return cnt;
}
- if (cnt <= len) return cnt;
- cnt -= len;
+ if (cnt <=
iov[0].iov_
len) return cnt;
+ cnt -=
iov[0].iov_
len;
f->rpos = f->buf;
f->rend = f->buf + cnt;
f->rpos = f->buf;
f->rend = f->buf + cnt;
+ if (f->buf_size) buf[len-1] = *f->rpos++;
return len;
}
return len;
}