From: Thomas Schwinge Subject: [PATCH] socket_flags 2008-12-17 Thomas Schwinge SOCK_CLOEXEC and SOCK_NONBLOCK for socket on GNU Hurd. * sysdeps/mach/hurd/socket.c (__socket): Handle SOCK_CLOEXEC and SOCK_NONBLOCK. * sysdeps/mach/hurd/kernel-features.h (__ASSUME_SOCK_CLOEXEC): Define. --- sysdeps/mach/hurd/kernel-features.h | 1 + sysdeps/mach/hurd/socket.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sysdeps/mach/hurd/kernel-features.h b/sysdeps/mach/hurd/kernel-features.h index 29d73c4..2b10327 100644 --- a/sysdeps/mach/hurd/kernel-features.h +++ b/sysdeps/mach/hurd/kernel-features.h @@ -23,3 +23,4 @@ #define __ASSUME_O_CLOEXEC 1 #define __ASSUME_DUP3 1 #define __ASSUME_ACCEPT4 1 +#define __ASSUME_SOCK_CLOEXEC 1 diff --git a/sysdeps/mach/hurd/socket.c b/sysdeps/mach/hurd/socket.c index 7917686..9bb1eee 100644 --- a/sysdeps/mach/hurd/socket.c +++ b/sysdeps/mach/hurd/socket.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Create a new socket of type TYPE in domain DOMAIN, using protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically. @@ -33,6 +34,11 @@ __socket (domain, type, protocol) { error_t err; socket_t sock, server; + int flags = sock_to_o_flags (type & ~SOCK_TYPE_MASK); + type &= SOCK_TYPE_MASK; + + if (flags & ~(O_CLOEXEC | O_NONBLOCK)) + return __hurd_fail (EINVAL); /* Find the socket server for DOMAIN. */ server = _hurd_socket_server (domain, 0); @@ -58,10 +64,17 @@ __socket (domain, type, protocol) || err == MIG_BAD_ID || err == EOPNOTSUPP) err = EAFNOSUPPORT; + if (! err) + { + if (flags & O_NONBLOCK) + err = __io_set_some_openmodes (sock, O_NONBLOCK); + /* TODO: do we need special ERR massaging after the previous call? */ + } + if (err) return __hurd_fail (err); - return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1); + return _hurd_intern_fd (sock, O_IGNORE_CTTY | flags, 1); } weak_alias (__socket, socket) -- tg: (703def4..) t/socket_flags (depends on: t/fcntl-internal.h)