mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
bef8fd6013
qsort_r is defined in the same file as qsort, but is not an ISO C function, so should be a weak alias for __qsort_r. The uses in getaddrinfo should also call __qsort_r, since getaddrinfo is a POSIX function and qsort_r isn't. This patch implements this. Because nscd uses the getaddrinfo sources outside libc, as do the tst-rfc3484 tests, a #define of __qsort_r to qsort_r is added there alongside the similar defines for other libc-internal symbols used in getaddrinfo. Tested for x86_64 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). [BZ #17571] * stdlib/msort.c (qsort_r): Rename to __qsort_r and define as weak alias of __qsort_r. (qsort): Call __qsort_r instead of qsort_r. * include/stdlib.h (qsort_r): Do not call libc_hidden_proto. (__qsort_r): Declare. Call libc_hidden_proto. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Call __qsort_r instead of qsort_r. * nscd/gai.c (__qsort_r): Define to qsort_r. * posix/tst-rfc3484.c (__qsort_r): Likewise. * posix/tst-rfc3484-2.c (__qsort_r): Likewise. * posix/tst-rfc3484-3.c (__qsort_r): Likewise.
49 lines
1.6 KiB
C
49 lines
1.6 KiB
C
/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2004.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <alloca.h>
|
|
|
|
/* This file uses the getaddrinfo code but it compiles it without NSCD
|
|
support. We just need a few symbol renames. */
|
|
#define __inet_aton inet_aton
|
|
#define __ioctl ioctl
|
|
#define __getsockname getsockname
|
|
#define __socket socket
|
|
#define __recvmsg recvmsg
|
|
#define __bind bind
|
|
#define __sendto sendto
|
|
#define __strchrnul strchrnul
|
|
#define __getline getline
|
|
#define __qsort_r qsort_r
|
|
/* nscd uses 1MB or 2MB thread stacks. */
|
|
#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
|
|
|
|
/* We are nscd, so we don't want to be talking to ourselves. */
|
|
#undef USE_NSCD
|
|
|
|
#include <getaddrinfo.c>
|
|
|
|
/* Support code. */
|
|
#include <check_pf.c>
|
|
#include <check_native.c>
|
|
#ifdef HAVE_LIBIDN
|
|
# include <libidn/idn-stub.c>
|
|
#endif
|
|
|
|
/* Some variables normally defined in libc. */
|
|
service_user *__nss_hosts_database;
|