diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-03-31 22:00:59 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2013-04-02 15:02:48 -0400 |
| commit | 601c4e8ce69338652b3c9178386cbc05de8bae8d (patch) | |
| tree | 8c76835f8bc34a1dd81e1f48ec38c02b32e3e766 /src/udev/udev-ctrl.c | |
| parent | 20d47ae5b565723c596b5c8afbfd6f7583a9f49e (diff) | |
udev: update
This updates the daemon codebase to upstream.
Authors:
Zbigniew Jędrzejewski-Szmek
Lennart Poettering
Václav Pavlín
Kay Sievers
Harald Hoyer
Rob Clark
Zeeshan Ali (Khattak)
See http://cgit.freedesktop.org/systemd/systemd/log/src/udev
Ian is signing off but has some concerns on a few of the changes
that he may fix in future commits.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'src/udev/udev-ctrl.c')
| -rw-r--r-- | src/udev/udev-ctrl.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index c0c3fe5ae7..4586b014e7 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -10,7 +10,6 @@ */ #include <errno.h> -#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <stddef.h> @@ -191,24 +190,8 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) #if HAVE_DECL_ACCEPT4 conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); - - /* Fallback path when accept4() is unavailable */ - if ( conn->sock < 0 && (errno == ENOSYS || errno == ENOTSUP) ) - { - conn->sock = accept(uctrl->sock, NULL, NULL); - - if (conn->sock >= 0) { - fcntl(conn->sock, F_SETFL, O_NONBLOCK); - fcntl(conn->sock, F_SETFD, FD_CLOEXEC); - } - } #else conn->sock = accept(uctrl->sock, NULL, NULL); - - if (conn->sock >= 0) { - fcntl(conn->sock, F_SETFL, O_NONBLOCK); - fcntl(conn->sock, F_SETFD, FD_CLOEXEC); - } #endif if (conn->sock < 0) { |