mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41: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.
159 lines
4.4 KiB
C
159 lines
4.4 KiB
C
/* Look up a symbol in a shared object loaded by `dlopen'.
|
|
Copyright (C) 1999, 2000 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 <stddef.h>
|
|
#include <setjmp.h>
|
|
#include <libintl.h>
|
|
|
|
#include <dlfcn.h>
|
|
#include <ldsodefs.h>
|
|
#include <dl-hash.h>
|
|
|
|
void *
|
|
internal_function
|
|
_dl_sym (void *handle, const char *name, void *who)
|
|
{
|
|
const ElfW(Sym) *ref = NULL;
|
|
lookup_t result;
|
|
ElfW(Addr) caller = (ElfW(Addr)) who;
|
|
struct link_map *match;
|
|
struct link_map *l;
|
|
|
|
/* If the address is not recognized the call comes from the main
|
|
program (we hope). */
|
|
match = _dl_loaded;
|
|
|
|
/* Find the highest-addressed object that CALLER is not below. */
|
|
for (l = _dl_loaded; l != NULL; l = l->l_next)
|
|
if (caller >= l->l_map_start && caller < l->l_map_end)
|
|
{
|
|
/* There must be exactly one DSO for the range of the virtual
|
|
memory. Otherwise something is really broken. */
|
|
match = l;
|
|
break;
|
|
}
|
|
|
|
if (handle == RTLD_DEFAULT)
|
|
/* Search the global scope as seen in the caller object. */
|
|
result = _dl_lookup_symbol (name, match, &ref, match->l_scope, 0, 0);
|
|
else
|
|
{
|
|
if (handle != RTLD_NEXT)
|
|
{
|
|
/* Search the scope of the given object. */
|
|
struct link_map *map = handle;
|
|
|
|
result = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
|
|
0, 1);
|
|
}
|
|
else
|
|
{
|
|
if (__builtin_expect (match == _dl_loaded, 0))
|
|
{
|
|
if (! _dl_loaded
|
|
|| caller < _dl_loaded->l_map_start
|
|
|| caller >= _dl_loaded->l_map_end)
|
|
_dl_signal_error (0, NULL, N_("\
|
|
RTLD_NEXT used in code not dynamically loaded"));
|
|
}
|
|
|
|
l = match;
|
|
while (l->l_loader != NULL)
|
|
l = l->l_loader;
|
|
|
|
result = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
|
|
match);
|
|
}
|
|
}
|
|
|
|
if (ref != NULL)
|
|
return DL_SYMBOL_ADDRESS (result, ref);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void *
|
|
internal_function
|
|
_dl_vsym (void *handle, const char *name, const char *version, void *who)
|
|
{
|
|
const ElfW(Sym) *ref = NULL;
|
|
struct r_found_version vers;
|
|
lookup_t result;
|
|
ElfW(Addr) caller = (ElfW(Addr)) who;
|
|
struct link_map *match;
|
|
struct link_map *l;
|
|
|
|
/* Compute hash value to the version string. */
|
|
vers.name = version;
|
|
vers.hidden = 1;
|
|
vers.hash = _dl_elf_hash (version);
|
|
/* We don't have a specific file where the symbol can be found. */
|
|
vers.filename = NULL;
|
|
|
|
/* If the address is not recognized the call comes from the main
|
|
program (we hope). */
|
|
match = _dl_loaded;
|
|
|
|
/* Find the highest-addressed object that CALLER is not below. */
|
|
for (l = _dl_loaded; l != NULL; l = l->l_next)
|
|
if (caller >= l->l_map_start && caller < l->l_map_end)
|
|
{
|
|
/* There must be exactly one DSO for the range of the virtual
|
|
memory. Otherwise something is really broken. */
|
|
match = l;
|
|
break;
|
|
}
|
|
|
|
if (handle == RTLD_DEFAULT)
|
|
/* Search the global scope. */
|
|
result = _dl_lookup_versioned_symbol (name, match, &ref, match->l_scope,
|
|
&vers, 0, 0);
|
|
else if (handle == RTLD_NEXT)
|
|
{
|
|
if (__builtin_expect (match == _dl_loaded, 0))
|
|
{
|
|
if (! _dl_loaded
|
|
|| caller < _dl_loaded->l_map_start
|
|
|| caller >= _dl_loaded->l_map_end)
|
|
_dl_signal_error (0, NULL, N_("\
|
|
RTLD_NEXT used in code not dynamically loaded"));
|
|
}
|
|
|
|
l = match;
|
|
while (l->l_loader != NULL)
|
|
l = l->l_loader;
|
|
|
|
result = _dl_lookup_versioned_symbol_skip (name, l, &ref,
|
|
l->l_local_scope,
|
|
&vers, match);
|
|
}
|
|
else
|
|
{
|
|
/* Search the scope of the given object. */
|
|
struct link_map *map = handle;
|
|
result = _dl_lookup_versioned_symbol (name, map, &ref,
|
|
map->l_local_scope, &vers, 0, 1);
|
|
}
|
|
|
|
if (ref != NULL)
|
|
return DL_SYMBOL_ADDRESS (result, ref);
|
|
|
|
return NULL;
|
|
}
|