mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-28 15:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix stdio for character device regression

Browse source 
Caused by ed93fc3dd7
This commit is contained in:
Justine Tunney 2024-05-25 05:58:09 -07:00
parent ce9aeb2aed
commit 1df4296208
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libc/stdio/fread_unlocked.c
View file

@ -29,16 +29,15 @@
#include "libc/sysv/errfuns.h"
static ssize_t readvall(int fd, struct iovec *iov, int iovlen) {
int olde;
ssize_t rc;
size_t got, toto;
toto = 0;
olde = errno;
do {
if ((rc = readv(fd, iov, iovlen)) == -1) {
if (toto && errno == EINTR) {
errno = olde;
continue;
if (toto) {
if (errno == EINTR)
continue;
return toto;
}
return -1;
}
@ -135,7 +134,12 @@ size_t fread_unlocked(void *buf, size_t stride, size_t count, FILE *f) {
iov[1].iov_base = NULL;
iov[1].iov_len = 0;
}
if ((rc = readvall(f->fd, iov, 2)) == -1) {
if (f->bufmode == _IONBF) {
rc = readv(f->fd, iov, 2);
} else {
rc = readvall(f->fd, iov, 2);
}
if (rc == -1) {
f->state = errno;
return 0;
}