summaryrefslogtreecommitdiff
path: root/Userland/Utilities
diff options
context:
space:
mode:
authoralexmajor <5017286+alexmajor@users.noreply.github.com>2022-01-24 21:03:21 -0500
committerBrian Gianforcaro <b.gianfo@gmail.com>2022-02-01 04:58:24 +0000
commitad7845ed7df573f89ce56749a127338810f43fe5 (patch)
treef6bef3f481cc9b9d19d9fffd0cada9b40b2b313f /Userland/Utilities
parent61f2b7434f720fa26a883b534d658ad70b95ee1c (diff)
downloadserenity-ad7845ed7df573f89ce56749a127338810f43fe5.zip
sysctl: Port to LibMain
Diffstat (limited to 'Userland/Utilities')
-rw-r--r--Userland/Utilities/CMakeLists.txt1
-rw-r--r--Userland/Utilities/sysctl.cpp8
2 files changed, 6 insertions, 3 deletions
diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
index aa0e6f8066..306f342aa7 100644
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -167,6 +167,7 @@ target_link_libraries(strace LibMain)
target_link_libraries(su LibCrypt LibMain)
target_link_libraries(sync LibMain)
target_link_libraries(syscall LibMain)
+target_link_libraries(sysctl LibMain)
target_link_libraries(tac LibMain)
target_link_libraries(tail LibMain)
target_link_libraries(tar LibArchive LibCompress)
diff --git a/Userland/Utilities/sysctl.cpp b/Userland/Utilities/sysctl.cpp
index f339ddf2f8..4766da7d74 100644
--- a/Userland/Utilities/sysctl.cpp
+++ b/Userland/Utilities/sysctl.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2022, Alex Major
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -7,6 +8,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
+#include <LibMain/Main.h>
static bool s_set_variable = false;
@@ -92,7 +94,7 @@ static int handle_show_all()
return success ? 0 : 1;
}
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
{
bool show_all = false;
Vector<StringView> variables;
@@ -102,10 +104,10 @@ int main(int argc, char** argv)
args_parser.add_option(show_all, "Show all variables", "all", 'a');
args_parser.add_option(s_set_variable, "Set variables", "write", 'w');
args_parser.add_positional_argument(variables, "variable[=value]", "variables", Core::ArgsParser::Required::No);
- args_parser.parse(argc, argv);
+ args_parser.parse(arguments);
if (!show_all && variables.is_empty()) {
- args_parser.print_usage(stdout, argv[0]);
+ args_parser.print_usage(stdout, arguments.argv[0]);
return 1;
}