github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-02 10:51:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

io: Return from read even if return == -1 and errno == 0

Browse Source 
This happens on OpenIndiana/Solaris/Illumos/SunOS.

Elsewhere we use read_blocked, which already returned in this
case (and which we might want to use here as well!).
This commit is contained in:
Fabian Homborg 2019-02-13 20:15:09 +01:00
parent 4132bb1a19
commit c0dc1870f0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/io.cpp
View File

@ -95,12 +95,17 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
scoped_lock locker(append_lock_); scoped_lock locker(append_lock_);
ssize_t ret; ssize_t ret;
do { do {
errno = 0;
char buff[4096]; char buff[4096];
ret = read(fd, buff, sizeof buff); ret = read(fd, buff, sizeof buff);
if (ret > 0) { if (ret > 0) {
buffer_.append(&buff[0], &buff[ret]); buffer_.append(&buff[0], &buff[ret]);
} else if (ret == 0) { } else if (ret == 0) {
shutdown = true; shutdown = true;
} else if (ret == -1 && errno == 0) {
// No specific error. We assume we just return,
// since that's what we do in read_blocked.
return;
} else if (errno != EINTR && errno != EAGAIN) { } else if (errno != EINTR && errno != EAGAIN) {
wperror(L"read"); wperror(L"read");
return; return;