mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-02 09:33:31 +03:00
9a51759bdf
1999-02-23 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * malloc/malloc.c (mALLOC_SET_STATe): Handle the case where a non-checked heap is restored when malloc checking was requested by the user. (struct malloc_state): Add using_malloc_checking. (MALLOC_STATE_VERSION): Increment minor. (using_malloc_checking, disallow_malloc_check): New variables. (__malloc_check_init): Use them. (mALLOC_GET_STATe): Use mALLOc to allocate the malloc_state, so that it can the chunk is properly instrumented when malloc checking is enabled. Set the new using_malloc_checking field. (malloc_hook_ini): Correct signature when _LIBC is not defined. 1999-02-23 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sysdeps/unix/sysv/linux/i386/dl-librecon.h (DISTINGUISH_LIB_VERSIONS): Don't relocate DT_STRTAB a second time. * elf/rtld.c (dl_main): Rename paths_initialized to rtld_is_main. Don't call elf_get_dynamic_info and _dl_setup_hash a second time if ld.so is the main program. * stdio-common/vfprintf.c (vfprintf): If precision or width is too
62 lines
2.4 KiB
C
62 lines
2.4 KiB
C
/* Optional code to distinguish library flavours.
|
|
Copyright (C) 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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. */
|
|
|
|
#ifndef _DL_LIBRECON_H
|
|
#define _DL_LIBRECON_H 1
|
|
|
|
#define DISTINGUISH_LIB_VERSIONS \
|
|
do \
|
|
{ \
|
|
/* We have to find out whether the binary is linked against \
|
|
libc 5 or glibc. We do this by looking at all the DT_NEEDED \
|
|
entries. If one is libc.so.5 this is a libc 5 linked binary. */ \
|
|
if (_dl_loaded->l_info[DT_NEEDED]) \
|
|
{ \
|
|
/* We have dependencies. */ \
|
|
const ElfW(Dyn) *d; \
|
|
const char *strtab; \
|
|
\
|
|
strtab = (const char *) _dl_loaded->l_info[DT_STRTAB]->d_un.d_ptr; \
|
|
\
|
|
for (d = _dl_loaded->l_ld; d->d_tag != DT_NULL; ++d) \
|
|
if (d->d_tag == DT_NEEDED \
|
|
&& strcmp (strtab + d->d_un.d_val, "libc.so.5") == 0) \
|
|
break; \
|
|
\
|
|
/* We print a `5' or `6' depending on the outcome. */ \
|
|
_dl_sysdep_message (d->d_tag != DT_NULL ? "5\n" : "6\n", NULL); \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
/* Recognizing extra environment variables. */
|
|
#define EXTRA_LD_ENVVARS \
|
|
case 15: \
|
|
if (memcmp (&envline[3], "LIBRARY_VERSION", 15) == 0) \
|
|
{ \
|
|
_dl_correct_cache_id = envline[19] == '5' ? 2 : 3; \
|
|
break; \
|
|
}
|
|
|
|
/* Extra unsecure variables. */
|
|
#define EXTRA_UNSECURE_ENVVARS "LD_AOUT_LIBRARY_PATH", "LD_AOUT_PRELOAD"
|
|
|
|
#endif /* dl-librecon.h */
|