From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Dec 2013 20:38:52 +0000 (+0100)
Subject: sd-event: return 1 in sd_event_run() when we hit EINTR
X-Git-Tag: v209~791
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ff0031069ffeb0ccda209297b6b39c4786ac770b

sd-event: return 1 in sd_event_run() when we hit EINTR

That way we can distuingish timeouts from EINTR
---

diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd-bus/sd-event.c
index 727528bb3..a1baac52a 100644
--- a/src/libsystemd-bus/sd-event.c
+++ b/src/libsystemd-bus/sd-event.c
@@ -1986,7 +1986,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
         m = epoll_wait(e->epoll_fd, ev_queue, ev_queue_max,
                        timeout == (uint64_t) -1 ? -1 : (int) ((timeout + USEC_PER_MSEC - 1) / USEC_PER_MSEC));
         if (m < 0) {
-                r = errno == EAGAIN || errno == EINTR ? 0 : -errno;
+                r = errno == EAGAIN || errno == EINTR ? 1 : -errno;
                 goto finish;
         }