From 0200214b288810fc261b0b65c32f7068fcfa9b40 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 29 May 1996 04:48:04 +0000 Subject: Tue May 28 04:38:10 1996 Ulrich Drepper * limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646 character in UTF-8 encoding has that many bytes. * locale/langinfo.h: New element _NL_CTYPE_MB_CUR_MAX. * locale/categories.def: Add description of field _NL_CTYPE_MB_CUR_MAX. * locale/Makefile (routines): Add mb_cur_max. * locale/mb_cur_max.c: New file. This function gets called when the macro MB_CUR_MAX is used. * locale/C-ctype.c: Initialize new mb_cur_max field. * locale/localeinfo.h: Change magic value because of incompatible change. * locale/programs/ld-ctype.c: Determine value of mb_cur_max according to current character set and write it out with the rest. * stdlib/stdlib.h (MB_CUR_MAX): Not constant anymore. Get value according to currently used locale for catefory LC_CTYPE by calling the function __ctype_get_mb_cur_max. Tue May 28 03:27:46 1996 Ulrich Drepper * FAQ: Fix some typos. Tell that for Linux the kernel header files are necessary. * PROJECTS: New file. List of open jobs for glibc. * Makefile (distribute): Add PROJECTS. * crypt/GNUmakefile (headers): New variable. Mention crypt.h. * crypt/crypt.h: Header for crypt functions. * elf/elf.h: Add some new constants from recent Cygnus ELF header files. * login/getutid_r.c: Test for correct type. Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. Make really compliant with specification. * login/getutline_r.c, login/pututline_r.c: Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. Make really compliant with specification. * login/setutent_r.c: Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. * login/login.c, login/logout.c, login/logwtmp.c: Complete rewrite. Now based on getut*/setut* functions. * stdlib/strtol.c: Undo changes of Wed May 22 01:48:54 1996. This prevented using this file in other GNU packages. * sysdeps/gnu/utmpbits.h: Define _HAVE_UT_TYPE, _HAVE_UT_ID, and _HAVE_UT_TV because struct utmp has these members. * sysdeps/libm-i387/e_exp.S: Correct exp(+-Inf) case. * utmp.h: New file. Wrapper around login/utmp.h. * elf/dl-error.c (struct catch): New type. (catch): New static variable, struct catch *. (catch_env, signalled_errstring, signalled_objname): Variables removed. (_dl_signal_error): If CATCH is non-null, set its errstring and objname members and jump to CATCH->env. If it is null, call _dl_sysdep_fatal with a standard message. * elf/rtld.c (dl_main): Explode `doit' function into dl_main's body. No longer use _dl_catch_error. --- elf/dl-error.c | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) (limited to 'elf/dl-error.c') diff --git a/elf/dl-error.c b/elf/dl-error.c index a5c861190f..737bba7421 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -1,5 +1,5 @@ /* Error handling for runtime dynamic linker. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 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 @@ -20,18 +20,47 @@ Cambridge, MA 02139, USA. */ #include #include #include +#include + +/* This structure communicates state between _dl_catch_error and + _dl_signal_error. */ +struct catch + { + const char *errstring, *objname; /* 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; -static jmp_buf catch_env; -static const char *signalled_errstring, *signalled_objname; void _dl_signal_error (int errcode, const char *objname, const char *errstring) { - signalled_errstring = errstring ?: "DYNAMIC LINKER BUG!!!"; - signalled_objname = objname; - longjmp (catch_env, errcode ?: -1); + if (! errstring) + errstring = "DYNAMIC LINKER BUG!!!"; + + if (catch) + { + /* We are inside _dl_catch_error. Return to it. */ + catch->errstring = errstring; + catch->objname = objname; + longjmp (catch->env, errcode ?: -1); + } + else + { + /* Lossage while resolving the program's own symbols is always fatal. */ + extern char **_dl_argv; /* Set in rtld.c at startup. */ + _dl_sysdep_fatal (_dl_argv[0] ?: "", + ": error in loading shared libraries\n", + objname ?: "", objname ? ": " : "", + errstring, errcode ? ": " : "", + errcode ? strerror (errcode) : "", "\n", NULL); + } } int @@ -40,18 +69,20 @@ _dl_catch_error (const char **errstring, void (*operate) (void)) { int errcode; + struct catch c = { errstring: NULL, objname: NULL }; - signalled_errstring = signalled_objname = NULL; - errcode = setjmp (catch_env); + errcode = setjmp (c.env); if (errcode == 0) { + catch = &c; (*operate) (); + catch = NULL; *errstring = *objname = NULL; return 0; } /* We get here only if we longjmp'd out of OPERATE. */ - *errstring = signalled_errstring; - *objname = signalled_objname; + *errstring = c.errstring; + *objname = c.objname; return errcode == -1 ? 0 : errcode; } -- cgit 1.4.1