Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 12:15:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for issue where a file may be incompletely read on receipt of a signal.

Browse source
This commit is contained in:
ridiculousfish 2013-04-07 14:52:16 -07:00
parent 3f172d13b2
commit 42497d9932
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reader.cpp
View file

@ -3627,22 +3627,23 @@ static int read_ni(int fd, const io_chain_t &io)
{ {
if (errno == EINTR) if (errno == EINTR)
{ {
/* We got a signal, just keep going */ /* We got a signal, just keep going. Be sure that we call insert() below because we may get data as well as EINTR. */
continue; clearerr(in_stream);
} }
else if ((errno == EAGAIN || errno == EWOULDBLOCK) && make_fd_blocking(des) == 0) else if ((errno == EAGAIN || errno == EWOULDBLOCK) && make_fd_blocking(des) == 0)
{ {
/* We succeeded in making the fd blocking, try again */ /* We succeeded in making the fd blocking, keep going */
continue; clearerr(in_stream);
} }
else
{
/* Fatal error */ /* Fatal error */
debug(1, _(L"Error while reading from file descriptor")); debug(1, _(L"Error while reading from file descriptor"));
/* Reset buffer on error. We won't evaluate incomplete files. */ /* Reset buffer on error. We won't evaluate incomplete files. */
acc.clear(); acc.clear();
break; break;
}
} }
acc.insert(acc.end(), buff, buff + c); acc.insert(acc.end(), buff, buff + c);