mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-28 21:41:08 +00:00
d347a4ab1d
2003-07-31 Jakub Jelinek <jakub@redhat.com> * dlfcn/dlerror.c (once): New. (dlerror): Call __libc_once. (_dlerror_run): Remove once. 2003-07-31 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h (struct sigcontext): Sync with 2.5.7 and 2.5.73 kernel changes. 2003-07-31 Jakub Jelinek <jakub@redhat.com> * dlfcn/eval.c (funcall): Add noinline attribute to shut up warnings. * elf/rtld.c (dl_main): Cast ElfW(Addr) arguments with %Zx/%Zd formats to size_t. * elf/dl-lookup.c (_dl_debug_bindings): Likewise. * elf/tst-tls6.c (do_test): Use %zd format for l_tls_modid. * elf/tst-tls8.c (do_test): Use %zd format for modid1 and modid2. * gmon/tst-sprofil.c (main): Add parens to shut up warning. * iconv/tst-iconv3.c (main): Use %td instead of %zd for pointer difference argument. * stdio-common/tst-wc-printf.c (main): Cast arguments with %C format to wint_t. * stdlib/tst-limits.c (main): For WORD_BIT and LONG_BIT, use %d format and cast expected value to int. * sysdeps/generic/libc-start.c (STATIC): Add __attribute__((always_inline) if LIBC_START_MAIN is already defined. * sysdeps/powerpc/fpu/w_sqrt.c (a_nan, a_inf): Change from uint32_t to ieee_float_shape_type. (__sqrt): Avoid type punning. * sysdeps/powerpc/fpu/w_sqrtf.c (a_nan, a_inf): Change from uint32_t to ieee_float_shape_type. (__sqrtf): Avoid type punning. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela): Don't define refsym if in dl-conflict.c. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/unix/sysv/linux/i386/semctl.c (union semun): Add __old_buf. (__new_semctl): Shut up warning. * sysdeps/unix/sysv/linux/semctl.c (union semun): Add __old_buf. (__new_semctl): Shut up warning. * sysdeps/unix/sysv/linux/shmctl.c (__new_shmctl): Wrap long lines. Change old into union of __old_shmid_ds and __old_shminfo structs. Adjust all users. * wcsmbs/wcsmbs-tst1.c (main): Cast arguments with %C format to wint_t. 2003-07-31 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/utimes.c (__utimes): Fix actime and modtime computation. * sysdeps/unix/sysv/linux/futimes.c (__futimes): Likewise. * sysdeps/posix/utimes.c (__utimes): Likewise.
188 lines
5.1 KiB
C
188 lines
5.1 KiB
C
/* Return error detail for failing <dlfcn.h> functions.
|
|
Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003
|
|
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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <libintl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
/* Type for storing results of dynamic loading actions. */
|
|
struct dl_action_result
|
|
{
|
|
int errcode;
|
|
int returned;
|
|
const char *objname;
|
|
const char *errstring;
|
|
};
|
|
static struct dl_action_result last_result;
|
|
static struct dl_action_result *static_buf;
|
|
|
|
/* This is the key for the thread specific memory. */
|
|
static __libc_key_t key;
|
|
__libc_once_define (static, once);
|
|
|
|
/* Destructor for the thread-specific data. */
|
|
static void init (void);
|
|
static void free_key_mem (void *mem);
|
|
|
|
|
|
char *
|
|
dlerror (void)
|
|
{
|
|
char *buf = NULL;
|
|
struct dl_action_result *result;
|
|
|
|
/* If we have not yet initialized the buffer do it now. */
|
|
__libc_once (once, init);
|
|
|
|
/* Get error string. */
|
|
result = (struct dl_action_result *) __libc_getspecific (key);
|
|
if (result == NULL)
|
|
result = &last_result;
|
|
|
|
/* Test whether we already returned the string. */
|
|
if (result->returned != 0)
|
|
{
|
|
/* We can now free the string. */
|
|
if (result->errstring != NULL)
|
|
{
|
|
if (strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
result->errstring = NULL;
|
|
}
|
|
}
|
|
else if (result->errstring != NULL)
|
|
{
|
|
buf = (char *) result->errstring;
|
|
int n;
|
|
if (result->errcode == 0)
|
|
n = __asprintf (&buf, "%s%s%s",
|
|
result->objname,
|
|
result->objname[0] == '\0' ? "" : ": ",
|
|
_(result->errstring));
|
|
else
|
|
n = __asprintf (&buf, "%s%s%s: %s",
|
|
result->objname,
|
|
result->objname[0] == '\0' ? "" : ": ",
|
|
_(result->errstring),
|
|
strerror (result->errcode));
|
|
if (n != -1)
|
|
{
|
|
/* We don't need the error string anymore. */
|
|
if (strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
result->errstring = buf;
|
|
}
|
|
|
|
/* Mark the error as returned. */
|
|
result->returned = 1;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
int
|
|
internal_function
|
|
_dlerror_run (void (*operate) (void *), void *args)
|
|
{
|
|
struct dl_action_result *result;
|
|
|
|
/* If we have not yet initialized the buffer do it now. */
|
|
__libc_once (once, init);
|
|
|
|
/* Get error string and number. */
|
|
if (static_buf != NULL)
|
|
result = static_buf;
|
|
else
|
|
{
|
|
/* We don't use the static buffer and so we have a key. Use it
|
|
to get the thread-specific buffer. */
|
|
result = __libc_getspecific (key);
|
|
if (result == NULL)
|
|
{
|
|
result = (struct dl_action_result *) calloc (1, sizeof (*result));
|
|
if (result == NULL)
|
|
/* We are out of memory. Since this is no really critical
|
|
situation we carry on by using the global variable.
|
|
This might lead to conflicts between the threads but
|
|
they soon all will have memory problems. */
|
|
result = &last_result;
|
|
else
|
|
/* Set the tsd. */
|
|
__libc_setspecific (key, result);
|
|
}
|
|
}
|
|
|
|
if (result->errstring != NULL)
|
|
{
|
|
/* Free the error string from the last failed command. This can
|
|
happen if `dlerror' was not run after an error was found. */
|
|
if (strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
result->errstring = NULL;
|
|
}
|
|
|
|
result->errcode = _dl_catch_error (&result->objname, &result->errstring,
|
|
operate, args);
|
|
|
|
/* If no error we mark that no error string is available. */
|
|
result->returned = result->errstring == NULL;
|
|
|
|
return result->errstring != NULL;
|
|
}
|
|
|
|
|
|
/* Initialize buffers for results. */
|
|
static void
|
|
init (void)
|
|
{
|
|
if (__libc_key_create (&key, free_key_mem))
|
|
/* Creating the key failed. This means something really went
|
|
wrong. In any case use a static buffer which is better than
|
|
nothing. */
|
|
static_buf = &last_result;
|
|
}
|
|
|
|
static void
|
|
__attribute__ ((destructor))
|
|
fini (void)
|
|
{
|
|
if (last_result.errstring != NULL
|
|
&& strcmp (last_result.errstring, "out of memory") != 0)
|
|
free ((char *) last_result.errstring);
|
|
}
|
|
|
|
|
|
/* Free the thread specific data, this is done if a thread terminates. */
|
|
static void
|
|
free_key_mem (void *mem)
|
|
{
|
|
struct dl_action_result *result = (struct dl_action_result *) mem;
|
|
|
|
if (result->errstring != NULL
|
|
&& strcmp (result->errstring, "out of memory") != 0)
|
|
free ((char *) result->errstring);
|
|
|
|
free (mem);
|
|
__libc_setspecific (key, NULL);
|
|
}
|