From 47eab04cb98996403fc0e3d33d867399404268b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Wed, 27 Jan 2016 21:21:55 +0100
Subject: [PATCH] utils-jbus: handles EINTR
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: If89cc876dee54f21402cd7989ca43d0d91dd8f92
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 src/utils-jbus.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index 1f85a4c..7000009 100644
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -691,9 +691,14 @@ int jbus_read_write_dispatch_multiple(struct jbus **jbuses, int njbuses, int tom
 
 	r = jbus_dispatch_multiple(jbuses, njbuses, maxcount);
 	n = jbus_fill_pollfds(jbuses, njbuses, fds);
-	s = poll(fds, n, toms);
-	if (s < 0)
-		return r ? r : s;
+	for(;;) {
+		s = poll(fds, n, toms);
+		if (s >= 0)
+			break;
+		if (errno != EINTR)
+			return r ? r : s;
+		toms = 0;
+	}
 	n = jbus_dispatch_pollfds(jbuses, njbuses, fds, maxcount - r);
 	return n >= 0 ? r + n : r ? r : n;
 }
-- 
2.16.6