external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-24 12:55:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module/removables: handle poll() failures

Browse source
This commit is contained in:
Daniel Eklöf 2021-12-17 11:40:12 +01:00
parent 5d09e59f11
commit ffa86d84a5
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/removables.c
View file

@ -5,6 +5,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <poll.h> #include <poll.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -547,16 +548,26 @@ run(struct module *mod)
* mount/unmount operations */ * mount/unmount operations */
int mount_info_fd = open("/proc/self/mountinfo", O_RDONLY); int mount_info_fd = open("/proc/self/mountinfo", O_RDONLY);
int ret = 1;
while (true) { while (true) {
struct pollfd fds[] = { struct pollfd fds[] = {
{.fd = mod->abort_fd, .events = POLLIN}, {.fd = mod->abort_fd, .events = POLLIN},
{.fd = udev_monitor_get_fd(dev_mon), .events = POLLIN}, {.fd = udev_monitor_get_fd(dev_mon), .events = POLLIN},
{.fd = mount_info_fd, .events = POLLPRI}, {.fd = mount_info_fd, .events = POLLPRI},
}; };
poll(fds, 3, -1); if (poll(fds, sizeof(fds) / sizeof(fds[0]), -1) < 0) {
if (errno == EINTR)
continue;
if (fds[0].revents & POLLIN) LOG_ERRNO("failed to poll");
break; break;
}
if (fds[0].revents & POLLIN) {
ret = 0;
break;
}
bool update = false; bool update = false;
@ -587,7 +598,7 @@ run(struct module *mod)
udev_monitor_unref(dev_mon); udev_monitor_unref(dev_mon);
udev_unref(udev); udev_unref(udev);
return 0; return ret;
} }
static struct module * static struct module *