Merge pull request #297 from marckleinebudde/fix-candump

candump: fix epoll_wait() returning -1, errno == -EINTR
2021-05-28 12:22:59 +02:00 · 2021-05-28 12:22:59 +02:00 · a70801f1ce
parent f8a2cf01fa 1b4e317083
commit a70801f1ce
1 changed files with 4 additions and 4 deletions
--- a/candump.c
+++ b/candump.c
@ -690,10 +690,10 @@ int main(int argc, char **argv)
 	msg.msg_control = &ctrlmsg;

 	while (running) {
-
-		if ((num_events = epoll_wait(fd_epoll, events_pending, currmax, timeout_ms)) <= 0) {
-			//perror("epoll_wait");
-			running = 0;
+		num_events = epoll_wait(fd_epoll, events_pending, currmax, timeout_ms);
+		if (num_events == -1) {
+			if (errno != EINTR)
+				running = 0;
 			continue;
 		}