qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hurd: SOCK_CLOEXEC and SOCK_NONBLOCK for socket 

* sysdeps/mach/hurd/socket.c (__socket): Handle SOCK_CLOEXEC and
	SOCK_NONBLOCK.
This commit is contained in:
Thomas Schwinge 2018-07-20 01:22:12 +02:00 committed by Samuel Thibault
parent 46f2474e93
commit 6008824221
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads * sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads
to 1. to 1.
2018-07-20 Thomas Schwinge <tschwinge@gnu.org>
* sysdeps/mach/hurd/socket.c (__socket): Handle SOCK_CLOEXEC and
SOCK_NONBLOCK.
2018-07-19 Leonardo Sandoval <leonardo.sandoval.gonzalez@intel.com> 2018-07-19 Leonardo Sandoval <leonardo.sandoval.gonzalez@intel.com>
* benchtests/scripts/compare_bench.py (__main__): use the argparse * benchtests/scripts/compare_bench.py (__main__): use the argparse

15
sysdeps/mach/hurd/socket.c
View File

@ -21,6 +21,7 @@
#include <hurd/socket.h> #include <hurd/socket.h>
#include <hurd/fd.h> #include <hurd/fd.h>
#include <fcntl.h> #include <fcntl.h>
#include <fcntl-internal.h>
/* Create a new socket of type TYPE in domain DOMAIN, using /* Create a new socket of type TYPE in domain DOMAIN, using
protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically. protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically.
@ -30,6 +31,11 @@ __socket (int domain, int type, int protocol)
{ {
error_t err; error_t err;
socket_t sock, server; 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. */ /* Find the socket server for DOMAIN. */
server = _hurd_socket_server (domain, 0); server = _hurd_socket_server (domain, 0);
@ -55,10 +61,17 @@ __socket (int domain, int type, int protocol)
|| err == MIG_BAD_ID || err == EOPNOTSUPP) || err == MIG_BAD_ID || err == EOPNOTSUPP)
err = EAFNOSUPPORT; 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) if (err)
return __hurd_fail (err); return __hurd_fail (err);
return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1); return _hurd_intern_fd (sock, O_IGNORE_CTTY | flags, 1);
} }
libc_hidden_def (__socket) libc_hidden_def (__socket)