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;
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;
+ if (f->buf_size) buf[len-1] = *f->rpos++;
return len;
}