sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 06:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #336 from weidmueller/feature/fix-poll-function-calls

Browse Source 
Fix error detection of poll function calls
This commit is contained in:
Marc Kleine-Budde
2022-01-27 16:05:50 +01:00
committed by GitHub
parent 4858b2b307 25de6276e8
commit 4bd649d73a
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cangen.c
+4 -1
View File
@@ -503,8 +503,11 @@ resend:
return 1;
}
if (polltimeout) {
int ret;
/* wait for the write socket (with timeout) */
if (poll(&fds, 1, polltimeout) < 0) {
ret = poll(&fds, 1, polltimeout);
if (ret == 0 || (ret == -1 && errno != -EINTR)) {
perror("poll");
return 1;
}
cansequence.c
+1 -1
View File
@@ -216,7 +216,7 @@ static void do_send()
}
err = poll(fds, 1, 1000);
if (err == -1 && errno != -EINTR) {
if (err == 0 || (err == -1 && errno != -EINTR)) {
perror("poll()");
exit(EXIT_FAILURE);
}
j1939cat.c
+8 -4
View File
@@ -368,10 +368,12 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf,
int ret;
ret = poll(&fds, 1, priv->polltimeout);
if (ret == -EINTR)
if (ret == -1) {
if (errno == -EINTR)
continue;
if (ret < 0)
else
return -errno;
}
if (!ret)
return -ETIME;
if (!(fds.revents & events)) {
@@ -572,10 +574,12 @@ static int j1939cat_recv(struct j1939cat_priv *priv)
int ret;
ret = poll(&fds, 1, priv->polltimeout);
if (ret == -EINTR)
if (ret == -1) {
if (errno == -EINTR)
continue;
if (ret < 0)
else
return -errno;
}
if (!ret)
continue;
if (!(fds.revents & events)) {