SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util.c: ignore pollfd.revent for loop_read/loop_write

Browse Source 
Let read()/write() report any error/EOF.
This commit is contained in:
Chen Jie
2013-10-01 04:49:59 +02:00
committed by Lennart Poettering
parent e6dca81441
commit c22ceead43
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/util.c
+8 -4
View File
@@ -2186,8 +2186,10 @@ ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll) {
return n > 0 ? n : -errno;
}
if (pollfd.revents != POLLIN)
return n > 0 ? n : -EIO;
/* We knowingly ignore the revents value here,
* and expect that any error/EOF is reported
* via read()/write()
*/
continue;
}
@@ -2234,8 +2236,10 @@ ssize_t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
return n > 0 ? n : -errno;
}
if (pollfd.revents != POLLOUT)
return n > 0 ? n : -EIO;
/* We knowingly ignore the revents value here,
* and expect that any error/EOF is reported
* via read()/write()
*/
continue;
}