Hurd: accept4

5 files changed, 119 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index 9aa8753a48..0d38d2951d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
 
+	accept4 for GNU Hurd.
+	* include/sys/socket.h (__libc_accept4): New prototype.
+	* sysdeps/mach/hurd/accept4.c: New file, copy from accept.c.  Evolve it
+	to implement __libc_accept4.
+	* sysdeps/mach/hurd/accept.c (accept): Reimplement using
+	__libc_accept4.
+	* sysdeps/mach/hurd/kernel-features.h (__ASSUME_ACCEPT4): Define.
+
 	* sysdeps/mach/hurd/i386/____longjmp_chk.S: New file.
 	* sysdeps/mach/hurd/i386/signal-defines.sym: New file.
 	* sysdeps/mach/hurd/i386/Makefile (gen-as-const-headers): Add
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 2ae3428bdd..eac82136dd 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -135,6 +135,9 @@ extern int __libc_accept (int __fd, __SOCKADDR_ARG __addr,
 			  socklen_t *__restrict __addr_len)
      __THROW;
 libc_hidden_proto (accept)
+extern int __libc_accept4 (int __fd, __SOCKADDR_ARG __addr,
+			   socklen_t *__restrict __addr_len, int __flags)
+     __THROW;
 
 /* Return the length of a `sockaddr' structure.  */
 #ifdef _HAVE_SA_LEN
diff --git a/sysdeps/mach/hurd/accept.c b/sysdeps/mach/hurd/accept.c
index 78b5c67d81..52dfdf8baa 100644
--- a/sysdeps/mach/hurd/accept.c
+++ b/sysdeps/mach/hurd/accept.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1992,1993,1994,1997,1999,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2012 Free Software Foundation, Inc.
+
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,72 +16,16 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
 #include <sys/socket.h>
-#include <hurd.h>
-#include <hurd/fd.h>
-#include <hurd/socket.h>
 
 /* Await a connection on socket FD.
    When a connection arrives, open a new socket to communicate with it,
-   set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
+   set *ADDRARG (which is *ADDR_LEN bytes long) to the address of the connecting
    peer and *ADDR_LEN to the address's actual length, and return the
    new socket's descriptor, or -1 for errors.  */
 int
-accept (fd, addrarg, addr_len)
-      int fd;
-      __SOCKADDR_ARG addrarg;
-      socklen_t *addr_len;
+accept (int fd, __SOCKADDR_ARG addrarg, socklen_t *addr_len)
 {
-  error_t err;
-  socket_t new;
-  addr_port_t aport;
-  struct sockaddr *addr = addrarg.__sockaddr__;
-  char *buf = (char *) addr;
-  mach_msg_type_number_t buflen;
-  int type;
-
-  if (err = HURD_DPORT_USE (fd, __socket_accept (port, &new, &aport)))
-    return __hurd_dfail (fd, err);
-
-  if (addr != NULL)
-    {
-      buflen = *addr_len;
-      err = __socket_whatis_address (aport, &type, &buf, &buflen);
-      if (err == EOPNOTSUPP)
-	/* If the protocol server can't tell us the address, just return a
-	   zero-length one.  */
-	{
-	  buf = (char *)addr;
-	  buflen = 0;
-	  err = 0;
-	}
-    }
-  __mach_port_deallocate (__mach_task_self (), aport);
-
-  if (err)
-    {
-      __mach_port_deallocate (__mach_task_self (), new);
-      return __hurd_dfail (fd, err);
-    }
-
-  if (addr != NULL)
-    {
-      if (*addr_len > buflen)
-	*addr_len = buflen;
-      
-      if (buf != (char *) addr)
-	{
-	  memcpy (addr, buf, *addr_len);
-	  __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
-	}
-
-      if (buflen > 0)
-	addr->sa_family = type;
-    }
-
-  return _hurd_intern_fd (new, O_IGNORE_CTTY, 1);
+  return __libc_accept4 (fd, addrarg, addr_len, 0);
 }
 libc_hidden_def (accept)
diff --git a/sysdeps/mach/hurd/accept4.c b/sysdeps/mach/hurd/accept4.c
new file mode 100644
index 0000000000..a86e1771d6
--- /dev/null
+++ b/sysdeps/mach/hurd/accept4.c
@@ -0,0 +1,100 @@
+/* Copyright (C) 1992-2012 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <fcntl-internal.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <hurd.h>
+#include <hurd/fd.h>
+#include <hurd/socket.h>
+
+/* Await a connection on socket FD.
+   When a connection arrives, open a new socket to communicate with it,
+   set *ADDRARG (which is *ADDR_LEN bytes long) to the address of the connecting
+   peer and *ADDR_LEN to the address's actual length, and return the
+   new socket's descriptor, or -1 for errors.  The operation can be influenced
+   by the FLAGS parameter.  */
+int
+__libc_accept4 (int fd, __SOCKADDR_ARG addrarg, socklen_t *addr_len, int flags)
+{
+  error_t err;
+  socket_t new;
+  addr_port_t aport;
+  struct sockaddr *addr = addrarg.__sockaddr__;
+  char *buf = (char *) addr;
+  mach_msg_type_number_t buflen;
+  int type;
+
+  flags = sock_to_o_flags (flags);
+
+  if (flags & ~(O_CLOEXEC | O_NONBLOCK))
+    return __hurd_fail (EINVAL);
+
+  if (err = HURD_DPORT_USE (fd, __socket_accept (port, &new, &aport)))
+    return __hurd_dfail (fd, err);
+
+  if (addr != NULL)
+    {
+      buflen = *addr_len;
+      err = __socket_whatis_address (aport, &type, &buf, &buflen);
+      if (err == EOPNOTSUPP)
+	/* If the protocol server can't tell us the address, just return a
+	   zero-length one.  */
+	{
+	  buf = (char *)addr;
+	  buflen = 0;
+	  err = 0;
+	}
+    }
+  __mach_port_deallocate (__mach_task_self (), aport);
+
+  if (! err)
+    {
+      if (flags & O_NONBLOCK)
+	err = __io_set_some_openmodes (new, O_NONBLOCK);
+      /* TODO: do we need special ERR massaging after the previous call?  */
+    }
+
+  if (err)
+    {
+      __mach_port_deallocate (__mach_task_self (), new);
+      return __hurd_dfail (fd, err);
+    }
+
+  if (addr != NULL)
+    {
+      if (*addr_len > buflen)
+	*addr_len = buflen;
+
+      if (buf != (char *) addr)
+	{
+	  memcpy (addr, buf, *addr_len);
+	  __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
+	}
+
+      if (buflen > 0)
+	addr->sa_family = type;
+    }
+
+  return _hurd_intern_fd (new, O_IGNORE_CTTY | flags, 1);
+}
+libc_hidden_def (__libc_accept4)
+weak_alias (__libc_accept4, accept4)
diff --git a/sysdeps/mach/hurd/kernel-features.h b/sysdeps/mach/hurd/kernel-features.h
index 07caf31f21..a0ffcbe8eb 100644
--- a/sysdeps/mach/hurd/kernel-features.h
+++ b/sysdeps/mach/hurd/kernel-features.h
@@ -1,5 +1,5 @@
 /* Set flags signalling availability of certain operating system features.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,3 +28,5 @@
 #ifdef O_CLOEXEC
 # define __ASSUME_O_CLOEXEC	1
 #endif
+
+#define __ASSUME_ACCEPT4	1