diff --git a/Userland/Utilities/lsblk.cpp b/Userland/Utilities/lsblk.cpp index cf38835fef..ab97d98a18 100644 --- a/Userland/Utilities/lsblk.cpp +++ b/Userland/Utilities/lsblk.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include @@ -37,25 +37,45 @@ ErrorOr serenity_main(Main::Arguments arguments) while (di.has_next()) { auto dir = di.next_path(); - auto command_set_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/command_set", dir)); - if (!command_set_file->open(Core::OpenMode::ReadOnly)) { - dbgln("Error: Could not open {}: {}", command_set_file->name(), command_set_file->error_string()); + auto command_set_filename = String::formatted("/sys/devices/storage/{}/command_set", dir); + auto command_set_file = Core::Stream::File::open(command_set_filename, Core::Stream::OpenMode::Read); + if (command_set_file.is_error()) { + dbgln("Error: Could not open {}: {}", command_set_filename, command_set_file.error()); continue; } - auto last_lba_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/last_lba", dir)); - if (!last_lba_file->open(Core::OpenMode::ReadOnly)) { - dbgln("Error: Could not open {}: {}", last_lba_file->name(), last_lba_file->error_string()); + auto last_lba_filename = String::formatted("/sys/devices/storage/{}/last_lba", dir); + auto last_lba_file = Core::Stream::File::open(last_lba_filename, Core::Stream::OpenMode::Read); + if (last_lba_file.is_error()) { + dbgln("Error: Could not open {}: {}", last_lba_filename, last_lba_file.error()); continue; } - auto sector_size_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/sector_size", dir)); - if (!sector_size_file->open(Core::OpenMode::ReadOnly)) { - dbgln("Error: Could not open {}: {}", sector_size_file->name(), sector_size_file->error_string()); + auto sector_size_filename = String::formatted("/sys/devices/storage/{}/sector_size", dir); + auto sector_size_file = Core::Stream::File::open(sector_size_filename, Core::Stream::OpenMode::Read); + if (sector_size_file.is_error()) { + dbgln("Error: Could not open {}: {}", sector_size_filename, sector_size_file.error()); continue; } - String command_set = StringView(command_set_file->read_all().bytes()); - String last_lba = StringView(last_lba_file->read_all().bytes()); - String sector_size = StringView(sector_size_file->read_all().bytes()); + auto maybe_command_set = command_set_file.value()->read_all(); + if (maybe_command_set.is_error()) { + 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); }