diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 207347fa75..420acdf5b9 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -77,7 +77,7 @@ target_link_libraries(id LibMain) target_link_libraries(js LibJS LibLine LibMain) target_link_libraries(keymap LibKeyboard LibMain) target_link_libraries(lspci LibPCIDB) -target_link_libraries(lsusb LibUSBDB) +target_link_libraries(lsusb LibUSBDB LibMain) target_link_libraries(man LibMarkdown) target_link_libraries(markdown-check LibMarkdown) target_link_libraries(matroska LibVideo) diff --git a/Userland/Utilities/lsusb.cpp b/Userland/Utilities/lsusb.cpp index 5c4725c7ac..eb16029a4f 100644 --- a/Userland/Utilities/lsusb.cpp +++ b/Userland/Utilities/lsusb.cpp @@ -12,35 +12,22 @@ #include #include #include +#include +#include #include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } - - if (unveil("/sys/bus/usb", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/res/usb.ids", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } + TRY(Core::System::pledge("stdio rpath", nullptr)); + TRY(Core::System::unveil("/sys/bus/usb", "r")); + TRY(Core::System::unveil("/res/usb.ids", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); Core::ArgsParser args; args.set_general_help("List USB devices."); - args.parse(argc, argv); + args.parse(arguments); Core::DirIterator usb_devices("/sys/bus/usb", Core::DirIterator::SkipDots);