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

env: Convert to serenity_main(..)

Browse source
This commit is contained in:
Brian Gianforcaro 2021-12-24 08:23:25 -08:00 • committed by Brian Gianforcaro
parent 81c98502f3
commit 831242f32a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -86,6 +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(env LibMain)
target_link_libraries(expr LibRegex LibMain) 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)

11
Userland/Utilities/env.cpp
View file

@ -6,16 +6,15 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio rpath exec", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath exec"));
perror("pledge");
return 1;
}
bool ignore_env = false; bool ignore_env = false;
const char* split_string = nullptr; const char* split_string = nullptr;
@ -28,7 +27,7 @@ int main(int argc, char** argv)
args_parser.add_option(split_string, "Process and split S into separate arguments; used to pass multiple arguments on shebang lines", "split-string", 'S', "S"); args_parser.add_option(split_string, "Process and split S into separate arguments; used to pass multiple arguments on shebang lines", "split-string", 'S', "S");
args_parser.add_positional_argument(values, "Environment and commands", "env/command", Core::ArgsParser::Required::No); args_parser.add_positional_argument(values, "Environment and commands", "env/command", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(arguments);
if (ignore_env) if (ignore_env)
clearenv(); clearenv();