Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: fix up behavior for VMIN != 0

Browse Source
This commit is contained in:
K. Lange 2023-11-02 16:59:24 +09:00
parent 613bc73dfd
commit 2f27cce0cd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/vfs/tty.c
View File

@ -366,9 +366,16 @@ ssize_t read_pty_slave(fs_node_t * node, off_t offset, size_t size, uint8_t *buf
return ring_buffer_read(pty->in, size, buffer);
} else {
if (pty->tios.c_cc[VMIN] == 0) {
return ring_buffer_read(pty->in, MIN(size, ring_buffer_unread(pty->in)), buffer);
return ring_buffer_read(pty->in, size, buffer);
} else {
return ring_buffer_read(pty->in, MIN(pty->tios.c_cc[VMIN], size), buffer);
ssize_t c = 0;
ssize_t vmin = MIN(pty->tios.c_cc[VMIN], size);
while (c < vmin) {
ssize_t r = ring_buffer_read(pty->in, size - c, buffer + c);
if (r < 0) return c ? c : r;
c += r;
}
return c;
}
}
}