From f12e13e81cdab4cf298648346e761348de811ef5 Mon Sep 17 00:00:00 2001 From: Itamar Date: Wed, 11 Nov 2020 21:13:55 +0200 Subject: [PATCH] Loader: Take main program name from auxiliary vector --- Userland/DynamicLoader/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Userland/DynamicLoader/main.cpp b/Userland/DynamicLoader/main.cpp index 8bd5e747981..c8a9904d623 100644 --- a/Userland/DynamicLoader/main.cpp +++ b/Userland/DynamicLoader/main.cpp @@ -244,15 +244,17 @@ static void clear_temporary_objects_mappings() static FlatPtr loader_main(auxv_t* auxvp) { int main_program_fd = -1; + String main_program_name; for (; auxvp->a_type != AT_NULL; ++auxvp) { if (auxvp->a_type == AuxiliaryValue::ExecFileDescriptor) { main_program_fd = auxvp->a_un.a_val; } + if (auxvp->a_type == AuxiliaryValue::ExecFilename) { + main_program_name = (const char*)auxvp->a_un.a_ptr; + } } ASSERT(main_program_fd >= 0); - // TODO: Pass this in the auxiliary vector - const String main_program_name = "MainProgram"; map_library(main_program_name, main_program_fd); map_dependencies(main_program_name);