RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:28:10 +00:00
Code Issues Activity Actions

hexdump: Port to LibMain

Browse source
This commit is contained in:
Lucas CHOLLET 2022-01-13 21:37:31 +01:00 • committed by Idan Horowitz
parent 02cb34a48a
commit dbcccde062
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -106,6 +106,7 @@ target_link_libraries(groups LibMain)
target_link_libraries(gunzip LibCompress LibMain) target_link_libraries(gunzip LibCompress LibMain)
target_link_libraries(gzip LibCompress LibMain) target_link_libraries(gzip LibCompress LibMain)
target_link_libraries(head LibMain) target_link_libraries(head LibMain)
target_link_libraries(hexdump LibMain)
target_link_libraries(id LibMain) target_link_libraries(id LibMain)
target_link_libraries(ini LibMain) target_link_libraries(ini LibMain)
target_link_libraries(jp LibMain) target_link_libraries(jp LibMain)

17
Userland/Utilities/hexdump.cpp
View file

@ -7,6 +7,7 @@
#include <AK/Array.h> #include <AK/Array.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibMain/Main.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
@ -18,7 +19,7 @@ enum class State {
SkipPrint SkipPrint
}; };
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments args)
{ {
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
const char* path = nullptr; const char* path = nullptr;
@ -26,20 +27,14 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(path, "Input", "input", Core::ArgsParser::Required::No); args_parser.add_positional_argument(path, "Input", "input", Core::ArgsParser::Required::No);
args_parser.add_option(verbose, "Display all input data", "verbose", 'v'); args_parser.add_option(verbose, "Display all input data", "verbose", 'v');
args_parser.parse(argc, argv); args_parser.parse(args);
RefPtr<Core::File> file; RefPtr<Core::File> file;
if (!path) { if (!path)
file = Core::File::standard_input(); file = Core::File::standard_input();
} else { else
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly); file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
if (file_or_error.is_error()) {
warnln("Failed to open {}: {}", path, file_or_error.error());
return 1;
}
file = file_or_error.value();
}
auto print_line = [](u8* buf, size_t size) { auto print_line = [](u8* buf, size_t size) {
VERIFY(size <= LINE_LENGTH_BYTES); VERIFY(size <= LINE_LENGTH_BYTES);