diff --git a/Userland/Libraries/LibELF/DynamicLinker.cpp b/Userland/Libraries/LibELF/DynamicLinker.cpp index 65f1ee988c..6ba24599a2 100644 --- a/Userland/Libraries/LibELF/DynamicLinker.cpp +++ b/Userland/Libraries/LibELF/DynamicLinker.cpp @@ -105,7 +105,7 @@ static Result, DlErrorMessage> map_library(Deprecat return loader; } -static Optional resolve_library(DeprecatedString const& name, DynamicObject const& parent_object) +Optional DynamicLinker::resolve_library(DeprecatedString const& name, DynamicObject const& parent_object) { // 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. @@ -185,7 +185,7 @@ static Result map_dependencies(DeprecatedString const& pat for (auto const& needed_name : get_dependencies(path)) { 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()) 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); 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); } @@ -493,7 +493,7 @@ static Result __dlopen(char const* filename, int flags) 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()) return DlErrorMessage { DeprecatedString::formatted("Could not find required shared library: {}", filename) }; diff --git a/Userland/Libraries/LibELF/DynamicLinker.h b/Userland/Libraries/LibELF/DynamicLinker.h index df17bae74a..4cfa7a6419 100644 --- a/Userland/Libraries/LibELF/DynamicLinker.h +++ b/Userland/Libraries/LibELF/DynamicLinker.h @@ -17,6 +17,8 @@ public: static Optional 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); + static Optional resolve_library(DeprecatedString const& name, DynamicObject const& parent_object); + private: DynamicLinker() = delete; ~DynamicLinker() = delete;