mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 06:21:07 +00:00
2373b30ea8
2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1255.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1255. * iconvdata/testdata/WINDOWS-1255: New file. * iconvdata/testdata/WINDOWS-1255..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1255 test. * iconvdata/CP1255.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1258.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1258. * iconvdata/testdata/WINDOWS-1258: New file. * iconvdata/testdata/WINDOWS-1258..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1258 test. * iconvdata/tst-table-from.c (try): Reset the iconv descriptor before the main call, and flush it afterwards. (utf8_decode): Return a string, possibly containing several Unicode characters. (main): Update all utf8_decode calls. * iconvdata/CP1258.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconv/gconv.c (__gconv): For flush without output, pass do_flush = 2. * iconv/skeleton.c: Distinguish do_flush = 1 and do_flush = 2. In the first case, set outbuf, outstart, outend, and call PREPARE_LOOP before EMIT_SHIFT_TO_INIT; then pass the output produced by this step down to the next step. In the second case, clear the state without calling EMIT_SHIFT_TO_INIT. * iconvdata/ibm930.c (EMIT_SHIFT_TO_INIT): Use outbuf instead of data->__outbuf, and outend instead of data->__outbufend. * iconvdata/ibm933.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm935.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm937.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm939.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn-ext.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-jp.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/utf-7.c (EMIT_SHIFT_TO_INIT): Likewise. 2001-05-21 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (dl_main): Compute l_map_end for the main program. * elf/dl-sym.c (_dl_sym): Don't check for l_addr == 0. If match == _dl_loaded, caller can still come from the main program. (_dl_vsym): Likewise. * elf/dl-open.c (dl_open_worker): Don't check for l_addr == 0. * elf/dl-error.c (_dl_signal_error): Change NULL objname into "". * elf/restest2.c: New test. * elf/Makefile (tests): Add restest2. (restest2, LDFLAGS-restest2): Add rules.
185 lines
5.5 KiB
C
185 lines
5.5 KiB
C
/* Error handling for runtime dynamic linker.
|
|
Copyright (C) 1995,96,97,98,99,2000,2001 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 <libintl.h>
|
|
#include <setjmp.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
#include <bits/libc-tsd.h>
|
|
|
|
/* This structure communicates state between _dl_catch_error and
|
|
_dl_signal_error. */
|
|
struct catch
|
|
{
|
|
const char *objname; /* Object/File name. */
|
|
const 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 message we return as a last resort. We define the string in a
|
|
variable since we have to avoid freeing it and so have to enable
|
|
a pointer comparison. See below and in dlfcn/dlerror.c. */
|
|
const char _dl_out_of_memory[] = "out of memory";
|
|
|
|
|
|
/* This points to a function which is called when an continuable 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 = N_("DYNAMIC LINKER BUG!!!");
|
|
|
|
lcatch = tsd_getspecific ();
|
|
if (objname == NULL)
|
|
objname = "";
|
|
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. The object name is always a string constant. */
|
|
size_t len_objname = strlen (objname) + 1;
|
|
size_t len_errstring = strlen (errstring) + 1;
|
|
|
|
lcatch->errstring = (char *) malloc (len_objname + len_errstring);
|
|
if (lcatch->errstring != NULL)
|
|
/* Make a copy of the object file name and the error string. */
|
|
lcatch->objname = memcpy (__mempcpy ((char *) lcatch->errstring,
|
|
errstring, len_errstring),
|
|
objname, len_objname);
|
|
else
|
|
{
|
|
/* This is better than nothing. */
|
|
lcatch->objname = "";
|
|
lcatch->errstring = _dl_out_of_memory;
|
|
}
|
|
longjmp (lcatch->env, errcode ?: -1);
|
|
}
|
|
else
|
|
{
|
|
/* Lossage while resolving the program's own symbols is always fatal. */
|
|
char buffer[1024];
|
|
_dl_fatal_printf ("\
|
|
%s: error while loading shared libraries: %s%s%s%s%s\n",
|
|
_dl_argv[0] ?: "<program name unknown>",
|
|
objname, *objname ? ": " : "",
|
|
errstring, errcode ? ": " : "",
|
|
(errcode
|
|
? __strerror_r (errcode, buffer, sizeof buffer)
|
|
: ""));
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_signal_cerror (int errcode,
|
|
const char *objname,
|
|
const char *errstring)
|
|
{
|
|
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
|
|
_dl_signal_error (errcode, objname, errstring);
|
|
}
|
|
|
|
|
|
int
|
|
internal_function
|
|
_dl_catch_error (const char **objname, const 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 (__builtin_expect (errcode, 0) == 0)
|
|
{
|
|
tsd_setspecific (&c);
|
|
(*operate) (args);
|
|
tsd_setspecific (old);
|
|
*objname = NULL;
|
|
*errstring = NULL;
|
|
return 0;
|
|
}
|
|
|
|
/* We get here only if we longjmp'd out of OPERATE. */
|
|
tsd_setspecific (old);
|
|
*objname = c.objname;
|
|
*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;
|
|
}
|