2022-01-01 18:54:23 +00:00
|
|
|
/* Copyright (C) 1994-2022 Free Software Foundation, Inc.
|
1997-05-26 23:01:17 +00:00
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-05-26 23:01:17 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-05-26 23:01:17 +00:00
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
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
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
1999-02-28 13:01:23 +00:00
|
|
|
#include <string.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <hurd.h>
|
|
|
|
#include <hurd/fd.h>
|
|
|
|
#include <hurd/socket.h>
|
2020-06-14 00:19:35 +00:00
|
|
|
#include <sysdep-cancel.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
/* Read N bytes into BUF through socket FD.
|
|
|
|
If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
|
|
|
|
the sender, and store the actual size of the address in *ADDR_LEN.
|
|
|
|
Returns the number of bytes read or -1 for errors. */
|
2001-04-24 13:36:50 +00:00
|
|
|
ssize_t
|
2015-10-19 21:23:47 +00:00
|
|
|
__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
|
|
|
|
socklen_t *addr_len)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
|
|
|
error_t err;
|
|
|
|
mach_port_t addrport;
|
|
|
|
char *bufp = buf;
|
|
|
|
mach_msg_type_number_t nread = n;
|
|
|
|
mach_port_t *ports;
|
2008-07-02 19:35:02 +00:00
|
|
|
mach_msg_type_number_t nports = 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
char *cdata = NULL;
|
|
|
|
mach_msg_type_number_t clen = 0;
|
1997-06-26 22:23:01 +00:00
|
|
|
struct sockaddr *addr = addrarg.__sockaddr__;
|
2020-06-14 00:19:35 +00:00
|
|
|
int cancel_oldtype;
|
|
|
|
|
|
|
|
cancel_oldtype = LIBC_CANCEL_ASYNC();
|
2020-06-28 00:15:56 +00:00
|
|
|
err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &addrport,
|
|
|
|
flags, &bufp, &nread,
|
|
|
|
&ports, &nports,
|
|
|
|
&cdata, &clen,
|
|
|
|
&flags,
|
|
|
|
n));
|
2020-06-14 00:19:35 +00:00
|
|
|
LIBC_CANCEL_RESET (cancel_oldtype);
|
|
|
|
|
|
|
|
if (err)
|
2008-07-02 09:53:29 +00:00
|
|
|
return __hurd_sockfail (fd, flags, err);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
/* Get address data for the returned address port if requested. */
|
2012-05-10 22:30:38 +00:00
|
|
|
if (addr != NULL && addrport != MACH_PORT_NULL)
|
1999-03-15 14:33:27 +00:00
|
|
|
{
|
|
|
|
char *buf = (char *) addr;
|
|
|
|
mach_msg_type_number_t buflen = *addr_len;
|
|
|
|
int type;
|
|
|
|
|
2020-06-14 00:19:35 +00:00
|
|
|
cancel_oldtype = LIBC_CANCEL_ASYNC();
|
1999-03-15 14:33:27 +00:00
|
|
|
err = __socket_whatis_address (addrport, &type, &buf, &buflen);
|
2020-06-14 00:19:35 +00:00
|
|
|
LIBC_CANCEL_RESET (cancel_oldtype);
|
1999-03-15 14:33:27 +00:00
|
|
|
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;
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
__mach_port_deallocate (__mach_task_self (), addrport);
|
2008-07-02 09:53:29 +00:00
|
|
|
return __hurd_sockfail (fd, flags, err);
|
1999-03-15 14:33:27 +00:00
|
|
|
}
|
2013-06-05 20:44:03 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
if (*addr_len > buflen)
|
|
|
|
*addr_len = buflen;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
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;
|
|
|
|
}
|
2012-05-10 22:30:38 +00:00
|
|
|
else if (addr_len != NULL)
|
|
|
|
*addr_len = 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-03-15 14:33:27 +00:00
|
|
|
__mach_port_deallocate (__mach_task_self (), addrport);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* Toss control data; we don't care. */
|
|
|
|
__vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen);
|
|
|
|
|
|
|
|
if (bufp != buf)
|
|
|
|
{
|
|
|
|
memcpy (buf, bufp, nread);
|
|
|
|
__vm_deallocate (__mach_task_self (), (vm_address_t) bufp, nread);
|
|
|
|
}
|
|
|
|
|
|
|
|
return nread;
|
|
|
|
}
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
|
|
|
|
weak_alias (__recvfrom, recvfrom)
|