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

lsblk: Port to Core::Stream

Browse source
This commit is contained in:
Sam Atkins 2022-09-14 15:49:14 +01:00 • committed by Linus Groh
parent 8d7179766a
commit 03a3b6f91c
1 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Userland/Utilities/lsblk.cpp
View file

@ -9,7 +9,7 @@
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/Stream.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
@ -37,25 +37,45 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
while (di.has_next()) { while (di.has_next()) {
auto dir = di.next_path(); auto dir = di.next_path();
auto command_set_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/command_set", dir)); auto command_set_filename = String::formatted("/sys/devices/storage/{}/command_set", dir);
if (!command_set_file->open(Core::OpenMode::ReadOnly)) { auto command_set_file = Core::Stream::File::open(command_set_filename, Core::Stream::OpenMode::Read);
dbgln("Error: Could not open {}: {}", command_set_file->name(), command_set_file->error_string()); if (command_set_file.is_error()) {
dbgln("Error: Could not open {}: {}", command_set_filename, command_set_file.error());
continue; continue;
} }
auto last_lba_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/last_lba", dir)); auto last_lba_filename = String::formatted("/sys/devices/storage/{}/last_lba", dir);
if (!last_lba_file->open(Core::OpenMode::ReadOnly)) { auto last_lba_file = Core::Stream::File::open(last_lba_filename, Core::Stream::OpenMode::Read);
dbgln("Error: Could not open {}: {}", last_lba_file->name(), last_lba_file->error_string()); if (last_lba_file.is_error()) {
dbgln("Error: Could not open {}: {}", last_lba_filename, last_lba_file.error());
continue; continue;
} }
auto sector_size_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/sector_size", dir)); auto sector_size_filename = String::formatted("/sys/devices/storage/{}/sector_size", dir);
if (!sector_size_file->open(Core::OpenMode::ReadOnly)) { auto sector_size_file = Core::Stream::File::open(sector_size_filename, Core::Stream::OpenMode::Read);
dbgln("Error: Could not open {}: {}", sector_size_file->name(), sector_size_file->error_string()); if (sector_size_file.is_error()) {
dbgln("Error: Could not open {}: {}", sector_size_filename, sector_size_file.error());
continue; continue;
} }
String command_set = StringView(command_set_file->read_all().bytes()); auto maybe_command_set = command_set_file.value()->read_all();
String last_lba = StringView(last_lba_file->read_all().bytes()); if (maybe_command_set.is_error()) {
String sector_size = StringView(sector_size_file->read_all().bytes()); dbgln("Error: Could not read {}: {}", command_set_filename, maybe_command_set.error());
continue;
}
String command_set = StringView(maybe_command_set.value().bytes());
auto maybe_last_lba = last_lba_file.value()->read_all();
if (maybe_last_lba.is_error()) {
dbgln("Error: Could not read {}: {}", last_lba_filename, maybe_last_lba.error());
continue;
}
String last_lba = StringView(maybe_last_lba.value().bytes());
auto maybe_sector_size = sector_size_file.value()->read_all();
if (maybe_sector_size.is_error()) {
dbgln("Error: Could not read {}: {}", sector_size_filename, maybe_sector_size.error());
continue;
}
String sector_size = StringView(maybe_sector_size.value().bytes());
outln(format_row, dir, command_set, sector_size, last_lba); outln(format_row, dir, command_set, sector_size, last_lba);
} }