aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-04 17:36:53 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-04 17:36:53 +0000
commit384ba4d30d4a77751a8068d9aebaaee2c02cf10c (patch)
treebacc8c2bfc5ed5ea7dad7a9e8eedf6726a90e24b
parentMerge branch 'releases/1.5' (diff)
fdm: do *not* keep polling on EINTR
This fixes an issue where foot --server did not exit on SIGINT. This happened because we never returned out from fdm_poll(), and thus we never saw ‘aborted’ being set.
-rw-r--r--fdm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fdm.c b/fdm.c
index e8b96cf7..39a72f5b 100644
--- a/fdm.c
+++ b/fdm.c
@@ -324,12 +324,11 @@ fdm_poll(struct fdm *fdm)
struct epoll_event events[tll_length(fdm->fds)];
- int r;
- do {
- r = epoll_wait(fdm->epoll_fd, events, tll_length(fdm->fds), -1);
- } while (unlikely(r < 0 && errno == EINTR));
+ int r = epoll_wait(fdm->epoll_fd, events, tll_length(fdm->fds), -1);
+ if (unlikely(r < 0)) {
+ if (errno == EINTR)
+ return true;
- if (r < 0) {
LOG_ERRNO("failed to epoll");
return false;
}