diff options
Diffstat (limited to 'src/env/__libc_start_main.c')
| -rw-r--r-- | src/env/__libc_start_main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c index 70af77b5..f31222b2 100644 --- a/src/env/__libc_start_main.c +++ b/src/env/__libc_start_main.c @@ -1,21 +1,21 @@ #include "libc.h" -/* Any use of __environ/environ will override this symbol. */ -char **__dummy_environ = (void *)-1; -weak_alias(__dummy_environ, ___environ); +void __init_security(size_t *); int __libc_start_main( int (*main)(int, char **, char **), int argc, char **argv, int (*init)(int, char **, char **), void (*fini)(void), void (*ldso_fini)(void)) { - /* Save the environment if it may be used by libc/application */ - char **envp = argv+argc+1; - if (___environ != (void *)-1) ___environ = envp; + char **envp = argv+argc+1, **auxv = envp; - /* Avoid writing 0 and triggering unnecessary COW */ - if (ldso_fini) libc.ldso_fini = ldso_fini; - if (fini) libc.fini = fini; + __environ = envp; + do auxv++; while (*auxv); + libc.auxv = (void *)++auxv; + libc.ldso_fini = ldso_fini; + libc.fini = fini; + + __init_security((void *)auxv); /* Execute constructors (static) linked into the application */ if (init) init(argc, argv, envp); |