mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
348ed5157b
1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nscd/nscd_getpw_r.c: Include nscd_proto.h for prototypes. * sysdeps/generic/errno-loc.c: Include <errno.h> for prototype, undefine errno to get variable. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Include <sys/fsuid.h> instead of <unistd.h> for prototype. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. 1998-11-30 Ulrich Drepper <drepper@cygnus.com> * misc/err.h: Correct comments and use protected attribute keywords. Reported by Joseph Myers <jsm28@cam.ac.uk>. 1998-11-29 Roland McGrath <roland@baalperazim.frob.com> * malloc/thread-m.h [_LIBC]: Include <bits/libc-tsd.h>, and remove tsd stuff from pthreads/cthreads libc sections. Use __libc_tsd_define for MALLOC key. [_LIBC] (tsd_key_t, tsd_key_create): Define to a zero-size type and a no-op, respectively. [_LIBC] (tsd_setspecific, tsd_getspecific): Use __libc_tsd_get/set. * elf/dl-error.c: Include <bits/libc-tsd.h>. Use __libc_tsd_define for DL_ERROR key. (tsd_setspecific, tsd_getspecific): Rewritten using __libc_tsd_get/set. * sysdeps/mach/hurd/bits/libc-tsd.h: New file. * sysdeps/generic/bits/libc-tsd.h: New file. * Makefile (distribute): Add bits/libc-tsd.h. 1998-10-12 Roland McGrath <roland@baalperazim.frob.com> * elf/dl-error.c: Remove kludge to check for ld.so load address. There is no need if weak undefined symbols are not used in ld.so; see linuxthreads/ChangeLog for changes to files linuxthreads/sysdeps/pthread/bits/libc-lock.h and linuxthreads/sysdeps/pthread/bits/libc-tsd.h. 1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/i386/bits/string.h (__memset_cc): Fix typo (s->__s). * sysdeps/i386/i486/bits/string.h: Add prototypes for all new inline functions. * sysdeps/i386/bits/string.h: Likewise. 1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Remove ipc_kludge. 1998-11-30 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * db2/progs/db_load/db_load.c (main): Avoid -Wparentheses warning.
160 lines
4.7 KiB
C
160 lines
4.7 KiB
C
/* Error handling for runtime dynamic linker.
|
|
Copyright (C) 1995, 1996, 1997, 1998 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <setjmp.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <elf/ldsodefs.h>
|
|
#include <bits/libc-tsd.h>
|
|
|
|
/* This structure communicates state between _dl_catch_error and
|
|
_dl_signal_error. */
|
|
struct catch
|
|
{
|
|
char *errstring; /* Error detail filled in here. */
|
|
jmp_buf env; /* longjmp here on error. */
|
|
};
|
|
|
|
/* Multiple threads at once can use the `_dl_catch_error' function. The
|
|
calls can come from `_dl_map_object_deps', `_dlerror_run', or from
|
|
any of the libc functionality which loads dynamic objects (NSS, iconv).
|
|
Therefore we have to be prepared to save the state in thread-local
|
|
memory. */
|
|
|
|
__libc_tsd_define (static, DL_ERROR)
|
|
#define tsd_getspecific() __libc_tsd_get (DL_ERROR)
|
|
#define tsd_setspecific(data) __libc_tsd_set (DL_ERROR, (data))
|
|
|
|
|
|
/* This points to a function which is called when an error is
|
|
received. Unlike the handling of `catch' this function may return.
|
|
The arguments will be the `errstring' and `objname'.
|
|
|
|
Since this functionality is not used in normal programs (only in ld.so)
|
|
we do not care about multi-threaded programs here. We keep this as a
|
|
global variable. */
|
|
static receiver_fct receiver;
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_signal_error (int errcode,
|
|
const char *objname,
|
|
const char *errstring)
|
|
{
|
|
struct catch *lcatch;
|
|
|
|
if (! errstring)
|
|
errstring = "DYNAMIC LINKER BUG!!!";
|
|
|
|
lcatch = tsd_getspecific ();
|
|
if (lcatch != NULL)
|
|
{
|
|
/* We are inside _dl_catch_error. Return to it. We have to
|
|
duplicate the error string since it might be allocated on the
|
|
stack. */
|
|
size_t objname_len = objname ? strlen (objname) + 2 : 0;
|
|
size_t errstring_len = strlen (errstring) + 1;
|
|
lcatch->errstring = malloc (objname_len + errstring_len);
|
|
if (lcatch->errstring != NULL)
|
|
{
|
|
if (objname_len > 0)
|
|
{
|
|
memcpy (lcatch->errstring, objname, objname_len - 2);
|
|
memcpy (lcatch->errstring + objname_len - 2, ": ", 2);
|
|
}
|
|
memcpy (lcatch->errstring + objname_len, errstring, errstring_len);
|
|
}
|
|
longjmp (lcatch->env, errcode ?: -1);
|
|
}
|
|
else if (receiver)
|
|
{
|
|
/* We are inside _dl_receive_error. Call the user supplied
|
|
handler and resume the work. The receiver will still be
|
|
installed. */
|
|
(*receiver) (errcode, objname, errstring);
|
|
}
|
|
else
|
|
{
|
|
/* Lossage while resolving the program's own symbols is always fatal. */
|
|
char buffer[1024];
|
|
_dl_sysdep_fatal (_dl_argv[0] ?: "<program name unknown>",
|
|
": error in loading shared libraries: ",
|
|
objname ?: "", objname && *objname ? ": " : "",
|
|
errstring, errcode ? ": " : "",
|
|
(errcode
|
|
? __strerror_r (errcode, buffer, sizeof buffer)
|
|
: ""), "\n", NULL);
|
|
}
|
|
}
|
|
|
|
int
|
|
internal_function
|
|
_dl_catch_error (char **errstring,
|
|
void (*operate) (void *),
|
|
void *args)
|
|
{
|
|
int errcode;
|
|
struct catch *volatile old;
|
|
struct catch c;
|
|
/* We need not handle `receiver' since setting a `catch' is handled
|
|
before it. */
|
|
|
|
/* Some systems (e.g., SPARC) handle constructors to local variables
|
|
inefficient. So we initialize `c' by hand. */
|
|
c.errstring = NULL;
|
|
|
|
old = tsd_getspecific ();
|
|
errcode = setjmp (c.env);
|
|
if (errcode == 0)
|
|
{
|
|
tsd_setspecific (&c);
|
|
(*operate) (args);
|
|
tsd_setspecific (old);
|
|
*errstring = NULL;
|
|
return 0;
|
|
}
|
|
|
|
/* We get here only if we longjmp'd out of OPERATE. */
|
|
tsd_setspecific (old);
|
|
*errstring = c.errstring;
|
|
return errcode == -1 ? 0 : errcode;
|
|
}
|
|
|
|
void
|
|
internal_function
|
|
_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args)
|
|
{
|
|
struct catch *old_catch;
|
|
receiver_fct old_receiver;
|
|
|
|
old_catch = tsd_getspecific ();
|
|
old_receiver = receiver;
|
|
|
|
/* Set the new values. */
|
|
tsd_setspecific (NULL);
|
|
receiver = fct;
|
|
|
|
(*operate) (args);
|
|
|
|
tsd_setspecific (old_catch);
|
|
receiver = old_receiver;
|
|
}
|