mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
8e17ea5817
2000-06-09 Ulrich Drepper <drepper@redhat.com> Rewrite error message handling. * elf/dl-deps.c (_dl_map_object_deps): Pass new parameter to _dl_catch_error. * elf/dl-error (struct catch): Add objname member. (_dl_signal_error): Take new parameter with object name. When passing message on simply store object name and duplicate error message. (_dl_catch_error): Take new parameter. Store object name in the place pointed to. * include/dlfcn.h: Adjust _dl_catch_error prototype. * sysdeps/generic/ldsodefs.h: Adjust _dl_signal_error prototype. * elf/dl-libc.c (dlerror_run): Pass new parameter to _dl_catch_error. * elf/dl-open.c (_dl_open): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/dl-close.c: Mark error messages with N_(). * elf/dl-deps.c: Likewise. * elf/dl-error.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-version.c: Likewise. * elf/dl-lookup.c: Add comments about problems with error message translations. * elf/dl-reloc.c: Likewise. * elf/dl-version.c: Likewise.
60 lines
2.4 KiB
C
60 lines
2.4 KiB
C
#ifndef _DLFCN_H
|
|
#include <dlfcn/dlfcn.h>
|
|
|
|
/* Now define the internal interfaces. */
|
|
extern void *__dlvsym (void *__handle, __const char *__name,
|
|
__const char *__version);
|
|
|
|
extern void *__libc_dlopen (__const char *__name);
|
|
extern void *__libc_dlsym (void *__map, __const char *__name);
|
|
extern int __libc_dlclose (void *__map);
|
|
|
|
/* Locate shared object containing the given address. */
|
|
extern int _dl_addr (const void *address, Dl_info *info)
|
|
internal_function;
|
|
|
|
/* Open the shared object NAME, relocate it, and run its initializer if it
|
|
hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If
|
|
the object is already opened, returns its existing map. */
|
|
extern void *_dl_open (const char *name, int mode, const void *caller)
|
|
internal_function;
|
|
|
|
/* Close an object previously opened by _dl_open. */
|
|
extern void _dl_close (void *map)
|
|
internal_function;
|
|
|
|
/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
|
|
RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns
|
|
the symbol value, which may be NULL. */
|
|
extern void *_dl_sym (void *handle, const char *name, void *who)
|
|
internal_function;
|
|
|
|
/* Look up version VERSION of symbol NAME in shared object HANDLE
|
|
(which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling
|
|
function, for RTLD_NEXT. Returns the symbol value, which may be
|
|
NULL. */
|
|
extern void *_dl_vsym (void *handle, const char *name, const char *version,
|
|
void *who)
|
|
internal_function;
|
|
|
|
/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
|
|
error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
|
|
set to a string constructed from the strings passed to _dl_signal_error,
|
|
and the error code passed is the return value and *OBJNAME is set to
|
|
the object name which experienced the problems. ERRSTRING if nonzero
|
|
points to a malloc'ed string which the caller has to free after use.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dl_catch_error (const char **objname, const char **errstring,
|
|
void (*operate) (void *),
|
|
void *args)
|
|
internal_function;
|
|
|
|
/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
|
|
_dl_catch_error. Returns zero for success, nonzero for failure; and
|
|
arranges for `dlerror' to return the error details.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dlerror_run (void (*operate) (void *), void *args)
|
|
internal_function;
|
|
|
|
#endif
|