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

wc: Port to LibMain

Browse source
This commit is contained in:
mjz19910 2022-01-03 22:15:52 -07:00 • committed by Brian Gianforcaro
parent fc78bbe78c
commit 7f9bd34d07
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -162,6 +162,7 @@ target_link_libraries(cpp-parser LibCpp LibGUI)
target_link_libraries(cpp-preprocessor LibCpp LibGUI) target_link_libraries(cpp-preprocessor LibCpp LibGUI)
target_link_libraries(w LibMain) target_link_libraries(w LibMain)
target_link_libraries(wasm LibWasm LibLine) target_link_libraries(wasm LibWasm LibLine)
target_link_libraries(wc LibMain)
target_link_libraries(which LibMain) target_link_libraries(which LibMain)
target_link_libraries(whoami LibMain) target_link_libraries(whoami LibMain)
target_link_libraries(watch LibMain) target_link_libraries(watch LibMain)

15
Userland/Utilities/wc.cpp
View file

@ -8,6 +8,7 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -85,12 +86,9 @@ static Count get_total_count(const Vector<Count>& counts)
return total_count; return total_count;
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath"));
perror("pledge");
return 1;
}
Vector<const char*> file_specifiers; Vector<const char*> file_specifiers;
@ -99,7 +97,7 @@ int main(int argc, char** argv)
args_parser.add_option(g_output_byte, "Output byte count", "bytes", 'c'); args_parser.add_option(g_output_byte, "Output byte count", "bytes", 'c');
args_parser.add_option(g_output_word, "Output word count", "words", 'w'); args_parser.add_option(g_output_word, "Output word count", "words", 'w');
args_parser.add_positional_argument(file_specifiers, "File to process", "file", Core::ArgsParser::Required::No); args_parser.add_positional_argument(file_specifiers, "File to process", "file", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(arguments);
if (!g_output_line && !g_output_byte && !g_output_word) if (!g_output_line && !g_output_byte && !g_output_word)
g_output_line = g_output_byte = g_output_word = true; g_output_line = g_output_byte = g_output_word = true;
@ -108,10 +106,7 @@ int main(int argc, char** argv)
for (const auto& file_specifier : file_specifiers) for (const auto& file_specifier : file_specifiers)
counts.append(get_count(file_specifier)); counts.append(get_count(file_specifier));
if (pledge("stdio", nullptr) < 0) { TRY(Core::System::pledge("stdio"));
perror("pledge");
return 1;
}
if (file_specifiers.is_empty()) if (file_specifiers.is_empty())
counts.append(get_count("-")); counts.append(get_count("-"));