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

blockdev: Port to LibMain

Browse source
This commit is contained in:
faxe1008 2021-11-23 17:16:42 +01:00 • committed by Andreas Kling
parent b918e798e6
commit 097c1e5335
2 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -56,6 +56,7 @@ target_link_libraries(arp LibMain)
target_link_libraries(asctl LibAudio) target_link_libraries(asctl LibAudio)
target_link_libraries(base64 LibMain) target_link_libraries(base64 LibMain)
target_link_libraries(bt LibSymbolication) target_link_libraries(bt LibSymbolication)
target_link_libraries(blockdev LibMain)
target_link_libraries(checksum LibCrypto) target_link_libraries(checksum LibCrypto)
target_link_libraries(chres LibGUI) target_link_libraries(chres LibGUI)
target_link_libraries(cksum LibCrypto) target_link_libraries(cksum LibCrypto)

23
Userland/Utilities/blockdev.cpp
View file

@ -5,6 +5,8 @@
*/ */
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -20,22 +22,11 @@ static void fetch_ioctl(int fd, int request)
outln("{}", value); outln("{}", value);
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (unveil("/dev", "r") < 0) { TRY(Core::System::unveil("/dev", "r"));
perror("unveil"); TRY(Core::System::unveil(nullptr, nullptr));
return 1; TRY(Core::System::pledge("stdio rpath", nullptr));
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
if (pledge("stdio rpath", nullptr) < 0) {
perror("pledge");
return 1;
}
const char* device = nullptr; const char* device = nullptr;
@ -47,7 +38,7 @@ int main(int argc, char** argv)
args_parser.add_option(flag_get_disk_size, "Get size in bytes", "size", 's'); args_parser.add_option(flag_get_disk_size, "Get size in bytes", "size", 's');
args_parser.add_option(flag_get_block_size, "Get block size in bytes", "block-size", 'b'); args_parser.add_option(flag_get_block_size, "Get block size in bytes", "block-size", 'b');
args_parser.add_positional_argument(device, "Device to query", "device"); args_parser.add_positional_argument(device, "Device to query", "device");
args_parser.parse(argc, argv); args_parser.parse(arguments);
int fd = open(device, O_RDONLY); int fd = open(device, O_RDONLY);
if (fd < 0) { if (fd < 0) {