mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
255 lines
6.3 KiB
C
255 lines
6.3 KiB
C
/* Return error detail for failing <dlfcn.h> functions.
|
|
Copyright (C) 1995-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 <dlfcn.h>
|
|
#include <libintl.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <ldsodefs.h>
|
|
|
|
#if !defined SHARED && IS_IN (libdl)
|
|
|
|
char *
|
|
dlerror (void)
|
|
{
|
|
return __dlerror ();
|
|
}
|
|
|
|
#else
|
|
|
|
/* Type for storing results of dynamic loading actions. */
|
|
struct dl_action_result
|
|
{
|
|
int errcode;
|
|
int returned;
|
|
bool malloced;
|
|
const char *objname;
|
|
const char *errstring;
|
|
};
|
|
static struct dl_action_result last_result;
|
|
static struct dl_action_result *static_buf;
|
|
|
|
/* This is the key for the thread specific memory. */
|
|
static __libc_key_t key;
|
|
__libc_once_define (static, once);
|
|
|
|
/* Destructor for the thread-specific data. */
|
|
static void init (void);
|
|
static void free_key_mem (void *mem);
|
|
|
|
|
|
char *
|
|
__dlerror (void)
|
|
{
|
|
char *buf = NULL;
|
|
struct dl_action_result *result;
|
|
|
|
# ifdef SHARED
|
|
if (__glibc_unlikely (_dlfcn_hook != NULL))
|
|
return _dlfcn_hook->dlerror ();
|
|
# endif
|
|
|
|
/* If we have not yet initialized the buffer do it now. */
|
|
__libc_once (once, init);
|
|
|
|
/* Get error string. */
|
|
result = (struct dl_action_result *) __libc_getspecific (key);
|
|
if (result == NULL)
|
|
result = &last_result;
|
|
|
|
/* Test whether we already returned the string. */
|
|
if (result->returned != 0)
|
|
{
|
|
/* We can now free the string. */
|
|
if (result->errstring != NULL)
|
|
{
|
|
if (strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
result->errstring = NULL;
|
|
}
|
|
}
|
|
else if (result->errstring != NULL)
|
|
{
|
|
buf = (char *) result->errstring;
|
|
int n;
|
|
if (result->errcode == 0)
|
|
n = __asprintf (&buf, "%s%s%s",
|
|
result->objname,
|
|
result->objname[0] == '\0' ? "" : ": ",
|
|
_(result->errstring));
|
|
else
|
|
n = __asprintf (&buf, "%s%s%s: %s",
|
|
result->objname,
|
|
result->objname[0] == '\0' ? "" : ": ",
|
|
_(result->errstring),
|
|
strerror (result->errcode));
|
|
if (n != -1)
|
|
{
|
|
/* We don't need the error string anymore. */
|
|
if (strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
result->errstring = buf;
|
|
}
|
|
|
|
/* Mark the error as returned. */
|
|
result->returned = 1;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
# ifdef SHARED
|
|
strong_alias (__dlerror, dlerror)
|
|
# endif
|
|
|
|
int
|
|
internal_function
|
|
_dlerror_run (void (*operate) (void *), void *args)
|
|
{
|
|
struct dl_action_result *result;
|
|
|
|
/* If we have not yet initialized the buffer do it now. */
|
|
__libc_once (once, init);
|
|
|
|
/* Get error string and number. */
|
|
if (static_buf != NULL)
|
|
result = static_buf;
|
|
else
|
|
{
|
|
/* We don't use the static buffer and so we have a key. Use it
|
|
to get the thread-specific buffer. */
|
|
result = __libc_getspecific (key);
|
|
if (result == NULL)
|
|
{
|
|
result = (struct dl_action_result *) calloc (1, sizeof (*result));
|
|
if (result == NULL)
|
|
/* We are out of memory. Since this is no really critical
|
|
situation we carry on by using the global variable.
|
|
This might lead to conflicts between the threads but
|
|
they soon all will have memory problems. */
|
|
result = &last_result;
|
|
else
|
|
/* Set the tsd. */
|
|
__libc_setspecific (key, result);
|
|
}
|
|
}
|
|
|
|
if (result->errstring != NULL)
|
|
{
|
|
/* Free the error string from the last failed command. This can
|
|
happen if `dlerror' was not run after an error was found. */
|
|
if (result->malloced)
|
|
free ((char *) result->errstring);
|
|
result->errstring = NULL;
|
|
}
|
|
|
|
result->errcode = GLRO(dl_catch_error) (&result->objname, &result->errstring,
|
|
&result->malloced, operate, args);
|
|
|
|
/* If no error we mark that no error string is available. */
|
|
result->returned = result->errstring == NULL;
|
|
|
|
return result->errstring != NULL;
|
|
}
|
|
|
|
|
|
/* Initialize buffers for results. */
|
|
static void
|
|
init (void)
|
|
{
|
|
if (__libc_key_create (&key, free_key_mem))
|
|
/* Creating the key failed. This means something really went
|
|
wrong. In any case use a static buffer which is better than
|
|
nothing. */
|
|
static_buf = &last_result;
|
|
}
|
|
|
|
|
|
static void
|
|
check_free (struct dl_action_result *rec)
|
|
{
|
|
if (rec->errstring != NULL
|
|
&& strcmp (rec->errstring, "out of memory") != 0)
|
|
{
|
|
/* We can free the string only if the allocation happened in the
|
|
C library used by the dynamic linker. This means, it is
|
|
always the C library in the base namespace. When we're statically
|
|
linked, the dynamic linker is part of the program and so always
|
|
uses the same C library we use here. */
|
|
#ifdef SHARED
|
|
struct link_map *map = NULL;
|
|
Dl_info info;
|
|
if (_dl_addr (check_free, &info, &map, NULL) != 0 && map->l_ns == 0)
|
|
#endif
|
|
free ((char *) rec->errstring);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
__attribute__ ((destructor))
|
|
fini (void)
|
|
{
|
|
check_free (&last_result);
|
|
}
|
|
|
|
|
|
/* Free the thread specific data, this is done if a thread terminates. */
|
|
static void
|
|
free_key_mem (void *mem)
|
|
{
|
|
check_free ((struct dl_action_result *) mem);
|
|
|
|
free (mem);
|
|
__libc_setspecific (key, NULL);
|
|
}
|
|
|
|
# ifdef SHARED
|
|
|
|
struct dlfcn_hook *_dlfcn_hook __attribute__((nocommon));
|
|
libdl_hidden_data_def (_dlfcn_hook)
|
|
|
|
# else
|
|
|
|
static struct dlfcn_hook _dlfcn_hooks =
|
|
{
|
|
.dlopen = __dlopen,
|
|
.dlclose = __dlclose,
|
|
.dlsym = __dlsym,
|
|
.dlvsym = __dlvsym,
|
|
.dlerror = __dlerror,
|
|
.dladdr = __dladdr,
|
|
.dladdr1 = __dladdr1,
|
|
.dlinfo = __dlinfo,
|
|
.dlmopen = __dlmopen
|
|
};
|
|
|
|
void
|
|
__libc_register_dlfcn_hook (struct link_map *map)
|
|
{
|
|
struct dlfcn_hook **hook;
|
|
|
|
hook = (struct dlfcn_hook **) __libc_dlsym_private (map, "_dlfcn_hook");
|
|
if (hook != NULL)
|
|
*hook = &_dlfcn_hooks;
|
|
}
|
|
# endif
|
|
#endif
|