From 1ef5fc339b32a8981135ede3291e1a7d591d4a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 10 Mar 2005 22:54:31 +0000 Subject: [PATCH] __init_env() is now called. malloc() currently cannot be used in initialize_before() in libroot.so, and therefore a _after() call has been added for this. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11670 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/libroot_init.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/kernel/libroot/libroot_init.c b/src/kernel/libroot/libroot_init.c index be72bdab31..fb22df1f69 100644 --- a/src/kernel/libroot/libroot_init.c +++ b/src/kernel/libroot/libroot_init.c @@ -12,6 +12,7 @@ void initialize_before(image_id imageID, struct uspace_program_args const *args); +void initialize_after(image_id imageID, struct uspace_program_args const *args); char *__progname = NULL; int __libc_argc; @@ -47,6 +48,14 @@ initialize_before(image_id imageID, struct uspace_program_args const *args) } +void +initialize_after(image_id imageID, struct uspace_program_args const *args) +{ + // ToDo: can be moved to _before() once malloc() works before + __init_env(args); +} + + void _init_c_library_(void); void _init_c_library_(void)