mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
5a82c74822
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
99 lines
2.8 KiB
C
99 lines
2.8 KiB
C
/* Copyright (C) 1992-2019 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; see the file COPYING.LIB. If
|
|
not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#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);
|
|
}
|
|
weak_alias (__libc_accept4, accept4)
|