mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
8d9618b7f6
1998-03-12 13:11 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp-test.c: More tests. (main): Set up arena for pathname expansion tests (in a temporary directory). (testit): Don't check word count or word vector if return value is non-zero. * posix/wordexp.c (exec_comm): Always chop off terminating linefeed (just like bash does). (parse_param): Change lots of occurrences of "if (!*env)" to "if (!env || !*env)". (parse_param): For assignment inside parameter expansion, use all expanded words in assignment rather than just the first. (parse_param): Corrected return value for parameter expansion of an unset variable when WRDE_UNDEF is in effect. (parse_dollars): Don't field-split if quoted. (wordexp): Opening brace character isn't allowed unquoted. 1998-03-12 Ulrich Drepper <drepper@cygnus.com> * elf/dlerror.c: Fix concurrency problems with error string and number. * elf/dl-deps.c (_dl_map_object_deps): Print debug info when filter/auxiliary are being loaded. 1998-03-12 14:24 Ulrich Drepper <drepper@cygnus.com> * elf/dlerror.c (last_object_name): Removed. (dlerror): Don't use last_object_name. (_dl_error_run): Omit second argument to _dl_catch_error. * elf/dl-error.c (struct catch): Remove objname member. (_dl_signal_error): Construct string including objname when given. (_dl_catch_error): Remove objname handling. * elf/link.h (_dl_catch_error): Fix prototype and comment. * elf/rtld.c (dl_main): Call _dl_catch_error correctly. * elf/dl-deps.c (_dl_map_objet_deps): Likewise. * nss/nsswitch.c (nss_dlerror_run): Likewise. * iconv/gconv_dl.c (dlerror_run): Likewise. [Corrects PR libc/501].
145 lines
4.2 KiB
C
145 lines
4.2 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 <link.h>
|
|
#include <setjmp.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
/* This is the internal function we use to generate the error string. */
|
|
extern char *_strerror_internal __P ((int, char *, size_t));
|
|
|
|
/* 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. */
|
|
};
|
|
|
|
/* This points to such a structure during a call to _dl_catch_error.
|
|
During implicit startup and run-time work for needed shared libraries,
|
|
this is null. */
|
|
static struct catch *catch;
|
|
|
|
/* 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'. */
|
|
static receiver_fct receiver;
|
|
|
|
|
|
void
|
|
_dl_signal_error (int errcode,
|
|
const char *objname,
|
|
const char *errstring)
|
|
{
|
|
if (! errstring)
|
|
errstring = "DYNAMIC LINKER BUG!!!";
|
|
|
|
if (catch)
|
|
{
|
|
/* 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;
|
|
catch->errstring = malloc (objname_len + errstring_len);
|
|
if (catch->errstring != NULL)
|
|
{
|
|
if (objname_len > 0)
|
|
{
|
|
memcpy (catch->errstring, objname, objname_len - 2);
|
|
memcpy (catch->errstring + objname_len - 2, ": ", 2);
|
|
}
|
|
memcpy (catch->errstring + objname_len, errstring, errstring_len);
|
|
}
|
|
longjmp (catch->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_internal (errcode, buffer, sizeof buffer)
|
|
: ""), "\n", NULL);
|
|
}
|
|
}
|
|
|
|
int
|
|
_dl_catch_error (char **errstring,
|
|
void (*operate) (void *),
|
|
void *args)
|
|
{
|
|
int errcode;
|
|
struct catch *old, 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 = catch;
|
|
errcode = setjmp (c.env);
|
|
if (errcode == 0)
|
|
{
|
|
catch = &c;
|
|
(*operate) (args);
|
|
catch = old;
|
|
*errstring = NULL;
|
|
return 0;
|
|
}
|
|
|
|
/* We get here only if we longjmp'd out of OPERATE. */
|
|
catch = old;
|
|
*errstring = c.errstring;
|
|
return errcode == -1 ? 0 : errcode;
|
|
}
|
|
|
|
void
|
|
_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args)
|
|
{
|
|
struct catch *old_catch;
|
|
receiver_fct old_receiver;
|
|
|
|
old_catch = catch;
|
|
old_receiver = receiver;
|
|
|
|
/* Set the new values. */
|
|
catch = NULL;
|
|
receiver = fct;
|
|
|
|
(*operate) (args);
|
|
|
|
catch = old_catch;
|
|
receiver = old_receiver;
|
|
}
|