67c94753e3
2001-08-11 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (ptmalloc_init): Don't call getenv five times. Instead use new function next_env_entry which iterates over the environment once. * sysdeps/arm/dl-machine.h (elf_machine_runtime_setup): Only set _dl_profile_map for the right object. * elf/dl-reloc.c (_dl_relocate_object): Allocate l_reloc_result only if consider_profiling is != 0, not if _dl_profile != NULL. * sysdeps/generic/dl-environ.c (_dl_next_ld_env_entry): Optimize a bit. Now returns pointer to first character set "LD_". * elf/rtld.c (process_envvars): Adjust for change above. * sysdeps/unix/sysv/linux/dl-librecon.h (EXTRA_LD_ENVVARS): Likewise. * sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS): Likewise. 2001-08-10 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (grow_heap): Use mmap() rather than mprotect() to allocate new memory, for better performance with Linux-2.4.x.
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
/* Environment handling for dynamic loader.
|
|
Copyright (C) 1995-1998, 2000, 2001 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 <string.h>
|
|
#include <ldsodefs.h>
|
|
|
|
extern char **_environ;
|
|
extern void unsetenv (const char *name);
|
|
|
|
/* Walk through the environment of the process and return all entries
|
|
starting with `LD_'. */
|
|
char *
|
|
internal_function
|
|
_dl_next_ld_env_entry (char ***position)
|
|
{
|
|
char **current = *position;
|
|
char *result = NULL;
|
|
|
|
while (*current != NULL)
|
|
{
|
|
if (__builtin_expect ((*current)[0] == 'L', 0)
|
|
&& (*current)[1] == 'D' && (*current)[2] == '_')
|
|
{
|
|
result = &(*current)[3];
|
|
|
|
/* Save current position for next visit. */
|
|
*position = ++current;
|
|
|
|
break;
|
|
}
|
|
|
|
++current;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void
|
|
unsetenv (const char *name)
|
|
{
|
|
const size_t len = strlen (name);
|
|
char **ep;
|
|
|
|
ep = _environ;
|
|
while (*ep != NULL)
|
|
if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
|
|
{
|
|
/* Found it. Remove this pointer by moving later ones back. */
|
|
char **dp = ep;
|
|
|
|
do
|
|
dp[0] = dp[1];
|
|
while (*dp++);
|
|
/* Continue the loop in case NAME appears again. */
|
|
}
|
|
else
|
|
++ep;
|
|
}
|