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

grep: Port to LibMain

Browse source
This commit is contained in:
Lucas CHOLLET 2022-01-13 21:17:16 +01:00 • committed by Idan Horowitz
parent 9e1e80954b
commit c2e7acc8bb
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Utilities/CMakeLists.txt
View file

@ -100,7 +100,7 @@ target_link_libraries(flock LibMain)
target_link_libraries(fortune LibMain) target_link_libraries(fortune LibMain)
target_link_libraries(functrace LibDebug LibX86 LibMain) target_link_libraries(functrace LibDebug LibX86 LibMain)
target_link_libraries(gml-format LibGUI LibMain) target_link_libraries(gml-format LibGUI LibMain)
target_link_libraries(grep LibRegex) target_link_libraries(grep LibRegex LibMain)
target_link_libraries(gron LibMain) target_link_libraries(gron LibMain)
target_link_libraries(groups LibMain) target_link_libraries(groups LibMain)
target_link_libraries(gunzip LibCompress) target_link_libraries(gunzip LibCompress)

13
Userland/Utilities/grep.cpp
View file

@ -5,14 +5,14 @@
*/ */
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/ByteBuffer.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Utf8View.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibRegex/Regex.h> #include <LibRegex/Regex.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -32,12 +32,9 @@ void fail(StringView format, Ts... args)
abort(); abort();
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments args)
{ {
if (pledge("stdio rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath", nullptr));
perror("pledge");
return 1;
}
Vector<const char*> files; Vector<const char*> files;
@ -128,7 +125,7 @@ int main(int argc, char** argv)
}); });
args_parser.add_option(count_lines, "Output line count instead of line contents", "count", 'c'); args_parser.add_option(count_lines, "Output line count instead of line contents", "count", 'c');
args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No); args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(args);
// mock grep behavior: if -e is omitted, use first positional argument as pattern // mock grep behavior: if -e is omitted, use first positional argument as pattern
if (patterns.size() == 0 && files.size()) if (patterns.size() == 0 && files.size())