mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
0595c98494
mq_notify (in the 1996 edition of POSIX) brings in references to recv and socket (not in POSIX until the 2001 edition). This patch fixes this by using __recv and __socket, exporting them from libc at version GLIBC_PRIVATE. Tested for x86_64 and x86 (testsuite and comparison of installed stripped shared libraries; PLT / dynamic symbol table changes render the comparison not particularly useful for libc). [BZ #18546] * socket/recv.c (__recv): Use libc_hidden_def. * socket/socket.c (__socket): Likewise. * sysdeps/mach/hurd/recv.c (__recv): Likewise. * sysdeps/mach/hurd/socket.c (__socket): Likewise. * sysdeps/unix/sysv/linux/generic/recv.c (__recv): Likewise. * sysdeps/unix/sysv/linux/recv.c (__recv): Use libc_hidden_weak. * sysdeps/unix/sysv/linux/socket.c (__socket): Use libc_hidden_def. * sysdeps/unix/sysv/linux/x86_64/recv.c (__recv): Use libc_hidden_weak. * include/sys/socket.h (__socket): Do not use attribute_hidden. Use libc_hidden_proto. (__recv): Likewise. * socket/Versions (libc): Export __recv and __socket at version GLIBC_PRIVATE. * sysdeps/unix/sysv/linux/mq_notify.c (helper_thread): Call __recv instead of recv. (init_mq_netlink): Call __socket instead of socket. * conform/Makefile (test-xfail-POSIX/mqueue.h/linknamespace): Remove variable.
65 lines
1.8 KiB
C
65 lines
1.8 KiB
C
/* Copyright (C) 1994-2015 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fd.h>
|
|
#include <hurd/socket.h>
|
|
#include <string.h>
|
|
|
|
/* Read N bytes into BUF from socket FD.
|
|
Returns the number read or -1 for errors. */
|
|
|
|
ssize_t
|
|
__recv (fd, buf, n, flags)
|
|
int fd;
|
|
void *buf;
|
|
size_t n;
|
|
int flags;
|
|
{
|
|
error_t err;
|
|
mach_port_t addrport;
|
|
char *bufp = buf;
|
|
mach_msg_type_number_t nread = n;
|
|
mach_port_t *ports;
|
|
mach_msg_type_number_t nports = 0;
|
|
char *cdata = NULL;
|
|
mach_msg_type_number_t clen = 0;
|
|
|
|
if (err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
|
|
flags, &bufp, &nread,
|
|
&ports, &nports,
|
|
&cdata, &clen,
|
|
&flags,
|
|
n)))
|
|
return __hurd_sockfail (fd, flags, err);
|
|
|
|
__mach_port_deallocate (__mach_task_self (), addrport);
|
|
__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;
|
|
}
|
|
libc_hidden_def (__recv)
|
|
weak_alias (__recv, recv)
|