Skip to content

udev-monitor: make the monitor fd non-blocking #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lwhsu wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −0
Open

udev-monitor: make the monitor fd non-blocking #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions udev-monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,20 @@ struct udev_monitor {
pthread_t thread;
};

static int
udev_monitor_set_fd_nonblock(int fd)
{
int flags;

flags = fcntl(fd, F_GETFL);
if (flags == -1)
return (-1);
if ((flags & O_NONBLOCK) != 0)
return (0);

return (fcntl(fd, F_SETFL, flags | O_NONBLOCK));
}

LIBUDEV_EXPORT struct udev_device *
udev_monitor_receive_device(struct udev_monitor *um)
{
Expand Down Expand Up @@ -226,6 +240,13 @@ udev_monitor_new_from_netlink(struct udev *udev, const char *name)
free(um);
return (NULL);
}
if (udev_monitor_set_fd_nonblock(um->fds[0]) == -1) {
ERR("fcntl failed");
close(um->fds[0]);
close(um->fds[1]);
free(um);
return (NULL);
}

um->udev = udev;
_udev_ref(udev);
Expand Down