RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:57:44 +00:00
Code Issues Activity Actions

Loader: Take main program name from auxiliary vector

Browse source
This commit is contained in:
Itamar 2020-11-11 21:13:55 +02:00 • committed by Andreas Kling
parent 0b0c09e647
commit f12e13e81c
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/DynamicLoader/main.cpp
View file

@ -244,15 +244,17 @@ static void clear_temporary_objects_mappings()
static FlatPtr loader_main(auxv_t* auxvp) static FlatPtr loader_main(auxv_t* auxvp)
{ {
int main_program_fd = -1; int main_program_fd = -1;
String main_program_name;
for (; auxvp->a_type != AT_NULL; ++auxvp) { for (; auxvp->a_type != AT_NULL; ++auxvp) {
if (auxvp->a_type == AuxiliaryValue::ExecFileDescriptor) { if (auxvp->a_type == AuxiliaryValue::ExecFileDescriptor) {
main_program_fd = auxvp->a_un.a_val; 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); 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_library(main_program_name, main_program_fd);
map_dependencies(main_program_name); map_dependencies(main_program_name);