d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If md_exec_hook is defined, provide a way to create the strings

Browse Source 
for the environment variables we look up at runtime. Otherwise,
there's no way they will change, optimize it at compile time.

Differential Review: https://reviews.freebsd.org/D2718
This commit is contained in:
imp 2016-01-03 04:32:13 +00:00
parent caa3baabf1
commit f48423fada
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libexec/rtld-elf/rtld.c
View File

@ -204,8 +204,6 @@ extern Elf_Dyn _DYNAMIC;
#define RTLD_IS_DYNAMIC() (&_DYNAMIC != NULL)
#endif
#define _LD(x) LD_ x
int dlclose(void *) __exported;
char *dlerror(void) __exported;
void *dlopen(const char *, int) __exported;
@ -325,6 +323,24 @@ ld_utrace_log(int event, void *handle, void *mapbase, size_t mapsize,
utrace(&ut, sizeof(ut));
}
#ifdef RTLD_VARIANT_ENV_NAMES
/*
* construct the env variable based on the type of binary that's
* running.
*/
static inline const char *
_LD(const char *var)
{
static char buffer[128];
strlcpy(buffer, ld_env_prefix, sizeof(buffer));
strlcat(buffer, var, sizeof(buffer));
return (buffer);
}
#else
#define _LD(x) LD_ x
#endif
/*
* Main entry point for dynamic linking. The first argument is the
* stack pointer. The stack is expected to be laid out as described