diff options
Diffstat (limited to 'libc/bionic/libc_init_common.cpp')
| -rw-r--r-- | libc/bionic/libc_init_common.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp index f78a11ab6..4702e1c9a 100644 --- a/libc/bionic/libc_init_common.cpp +++ b/libc/bionic/libc_init_common.cpp @@ -91,11 +91,11 @@ void __libc_add_main_thread() { __pthread_internal_add(main_thread); } -void __libc_init_common(KernelArgumentBlock& args) { +void __libc_init_common() { // Initialize various globals. - environ = args.envp; + environ = __libc_shared_globals()->init_environ; errno = 0; - __progname = args.argv[0] ? args.argv[0] : "<unknown>"; + __progname = __libc_shared_globals()->init_progname ?: "<unknown>"; #if !defined(__LP64__) __check_max_thread_id(); @@ -294,7 +294,7 @@ static void __initialize_personality() { #endif } -void __libc_init_AT_SECURE(KernelArgumentBlock& args) { +void __libc_init_AT_SECURE(char** env) { // Check that the kernel provided a value for AT_SECURE. errno = 0; unsigned long is_AT_SECURE = getauxval(AT_SECURE); @@ -305,11 +305,11 @@ void __libc_init_AT_SECURE(KernelArgumentBlock& args) { // https://www.freebsd.org/security/advisories/FreeBSD-SA-02:23.stdio.asc __nullify_closed_stdio(); - __sanitize_environment_variables(args.envp); + __sanitize_environment_variables(env); } // Now the environment has been sanitized, make it available. - environ = args.envp; + environ = __libc_shared_globals()->init_environ = env; __initialize_personality(); } |