eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-04-25 17:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Utiltities/elfdeps: Add an option to only print library paths

Browse Source 
This is useful for argument passing to other utilities on the terminal.
This commit is contained in:
Liav A.
2024-08-03 09:55:54 +03:00
committed by Tim Schumacher
parent 0482f4e117
commit c23005a3f0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Base/usr/share/man/man1/elfdeps.md
View File

@@ -17,6 +17,7 @@ $ elfdeps [-r] [-f] <path>
* `-f`, `--force-without-valid-interpreter`: Force library resolving on ELF
object without a valid interpreter
* `-r`, `--max-recursion`: Max library resolving recursion
* `-s`, `--path-only-format`: Use Path-only format printing
## Arguments

15
Userland/Utilities/elfdeps.cpp
View File

@@ -24,7 +24,7 @@
static Vector<ByteString> found_libraries;
static ErrorOr<void> recusively_resolve_all_necessary_libraries(StringView interpreter_path, size_t recursive_iteration_max, size_t recursive_iteration, ELF::DynamicObject& object)
static ErrorOr<void> recusively_resolve_all_necessary_libraries(StringView interpreter_path, bool path_only_formatting, size_t recursive_iteration_max, size_t recursive_iteration, ELF::DynamicObject& object)
{
if (recursive_iteration > recursive_iteration_max)
return ELOOP;
@@ -70,10 +70,15 @@ static ErrorOr<void> recusively_resolve_all_necessary_libraries(StringView inter
outln("Failed to map dynamic ELF object {}", library_path);
continue;
}
outln("{} => {}", library_name, library_path);
if (path_only_formatting)
outln("{}", library_path);
else
outln("{} => {}", library_name, library_path);
recursive_iteration++;
found_libraries.append(library_path);
TRY(recusively_resolve_all_necessary_libraries(interpreter_path, recursive_iteration_max, recursive_iteration, *library_object));
TRY(recusively_resolve_all_necessary_libraries(interpreter_path, path_only_formatting, recursive_iteration_max, recursive_iteration, *library_object));
}
return {};
}
@@ -85,9 +90,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
ByteString path {};
Optional<size_t> recursive_iteration_max;
bool force_without_valid_interpreter = false;
bool path_only_formatting = false;
Core::ArgsParser args_parser;
args_parser.add_option(recursive_iteration_max, "Max library resolving recursion", "max-recursion", 'r', "max recursion-level");
args_parser.add_option(path_only_formatting, "Path-only format printing", "path-only-format", 's');
args_parser.add_option(force_without_valid_interpreter, "Force library resolving on ELF object without valid interpreter", "force-without-valid-interpreter", 'f');
args_parser.add_positional_argument(path, "ELF path", "path");
args_parser.parse(arguments);
@@ -144,7 +151,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
outln("Failed to map dynamic ELF object {}", path);
return 1;
}
TRY(recusively_resolve_all_necessary_libraries(interpreter_path, recursive_iteration_max.value_or(10), 0, *object));
TRY(recusively_resolve_all_necessary_libraries(interpreter_path, path_only_formatting, recursive_iteration_max.value_or(10), 0, *object));
} else {
outln("ELF program is not dynamic loaded!");
return 1;