RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

LibELF: Export static resolve_library method of the DynamicLinker code

Browse source 
It will be used in the following commit to introduce a new utility to
use this method.
This commit is contained in:
Liav A 2022-12-18 16:41:09 +02:00 • committed by Andrew Kaster
parent ab8522aa17
commit efec344803
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibELF/DynamicLinker.cpp
View file

@ -105,7 +105,7 @@ static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(Deprecat
return loader; return loader;
} }
static Optional<DeprecatedString> resolve_library(DeprecatedString const& name, DynamicObject const& parent_object) Optional<DeprecatedString> DynamicLinker::resolve_library(DeprecatedString const& name, DynamicObject const& parent_object)
{ {
// Absolute and relative (to the current working directory) paths are already considered resolved. // Absolute and relative (to the current working directory) paths are already considered resolved.
// However, ensure that the returned path is absolute and canonical, so pass it through LexicalPath. // However, ensure that the returned path is absolute and canonical, so pass it through LexicalPath.
@ -185,7 +185,7 @@ static Result<void, DlErrorMessage> map_dependencies(DeprecatedString const& pat
for (auto const& needed_name : get_dependencies(path)) { for (auto const& needed_name : get_dependencies(path)) {
dbgln_if(DYNAMIC_LOAD_DEBUG, "needed library: {}", needed_name.characters()); dbgln_if(DYNAMIC_LOAD_DEBUG, "needed library: {}", needed_name.characters());
auto dependency_path = resolve_library(needed_name, parent_object); auto dependency_path = DynamicLinker::resolve_library(needed_name, parent_object);
if (!dependency_path.has_value()) if (!dependency_path.has_value())
return DlErrorMessage { DeprecatedString::formatted("Could not find required shared library: {}", needed_name) }; return DlErrorMessage { DeprecatedString::formatted("Could not find required shared library: {}", needed_name) };
@ -340,7 +340,7 @@ static void for_each_unfinished_dependency_of(DeprecatedString const& path, Hash
seen_names.set(path); seen_names.set(path);
for (auto const& needed_name : get_dependencies(path)) { for (auto const& needed_name : get_dependencies(path)) {
auto dependency_path = *resolve_library(needed_name, loader.value()->dynamic_object()); auto dependency_path = *DynamicLinker::resolve_library(needed_name, loader.value()->dynamic_object());
for_each_unfinished_dependency_of(dependency_path, seen_names, callback); for_each_unfinished_dependency_of(dependency_path, seen_names, callback);
} }
@ -493,7 +493,7 @@ static Result<void*, DlErrorMessage> __dlopen(char const* filename, int flags)
auto const& parent_object = **s_global_objects.get(s_main_program_path); auto const& parent_object = **s_global_objects.get(s_main_program_path);
auto library_path = (filename ? resolve_library(filename, parent_object) : s_main_program_path); auto library_path = (filename ? DynamicLinker::resolve_library(filename, parent_object) : s_main_program_path);
if (!library_path.has_value()) if (!library_path.has_value())
return DlErrorMessage { DeprecatedString::formatted("Could not find required shared library: {}", filename) }; return DlErrorMessage { DeprecatedString::formatted("Could not find required shared library: {}", filename) };

2
Userland/Libraries/LibELF/DynamicLinker.h
View file

@ -17,6 +17,8 @@ public:
static Optional<DynamicObject::SymbolLookupResult> lookup_global_symbol(StringView symbol); static Optional<DynamicObject::SymbolLookupResult> lookup_global_symbol(StringView symbol);
[[noreturn]] static void linker_main(DeprecatedString&& main_program_path, int fd, bool is_secure, int argc, char** argv, char** envp); [[noreturn]] static void linker_main(DeprecatedString&& main_program_path, int fd, bool is_secure, int argc, char** argv, char** envp);
static Optional<DeprecatedString> resolve_library(DeprecatedString const& name, DynamicObject const& parent_object);
private: private:
DynamicLinker() = delete; DynamicLinker() = delete;
~DynamicLinker() = delete; ~DynamicLinker() = delete;