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

expr: Port to LibMain

Browse source
This commit is contained in:
Kenneth Myhra 2021-12-14 10:22:35 +01:00 • committed by Brian Gianforcaro
parent 0edceb91c4
commit c5c0c7c620
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Utilities/CMakeLists.txt
View file

@ -86,7 +86,7 @@ target_link_libraries(dirname LibMain)
target_link_libraries(disasm LibX86) target_link_libraries(disasm LibX86)
target_link_libraries(dmesg LibMain) target_link_libraries(dmesg LibMain)
target_link_libraries(echo LibMain) target_link_libraries(echo LibMain)
target_link_libraries(expr LibRegex) target_link_libraries(expr LibRegex LibMain)
target_link_libraries(fdtdump LibDeviceTree LibMain) target_link_libraries(fdtdump LibDeviceTree LibMain)
target_link_libraries(file LibGfx LibIPC LibCompress LibMain) target_link_libraries(file LibGfx LibIPC LibCompress LibMain)
target_link_libraries(find LibMain) target_link_libraries(find LibMain)

21
Userland/Utilities/expr.cpp
View file

@ -11,6 +11,8 @@
#include <AK/Queue.h> #include <AK/Queue.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/StringView.h> #include <AK/StringView.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>
@ -571,24 +573,17 @@ NonnullOwnPtr<Expression> Expression::parse(Queue<StringView>& args, Precedence
fail("Invalid expression"); fail("Invalid expression");
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio", nullptr) < 0) { TRY(Core::System::pledge("stdio"sv));
perror("pledge"); TRY(Core::System::unveil(nullptr, nullptr));
return 3;
}
if (unveil(nullptr, nullptr) < 0) { if ((arguments.strings.size() == 2 && "--help"sv == arguments.strings[1]) || arguments.strings.size() == 1)
perror("unveil");
return 3;
}
if ((argc == 2 && "--help"sv == argv[1]) || argc == 1)
print_help_and_exit(); print_help_and_exit();
Queue<StringView> args; Queue<StringView> args;
for (int i = 1; i < argc; ++i) for (size_t i = 1; i < arguments.strings.size(); ++i)
args.enqueue(argv[i]); args.enqueue(arguments.strings[i]);
auto expression = Expression::parse(args); auto expression = Expression::parse(args);
if (!args.is_empty()) if (!args.is_empty())