lspci: Port to Core::Stream

1 files changed, 67 insertions, 25 deletions

diff --git a/Userland/Utilities/lspci.cpp b/Userland/Utilities/lspci.cpp
index 0c1bfdf853..aa7b93841c 100644
--- a/Userland/Utilities/lspci.cpp
+++ b/Userland/Utilities/lspci.cpp
@@ -13,7 +13,7 @@
 #include <AK/StringView.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DirIterator.h>
-#include <LibCore/File.h>
+#include <LibCore/Stream.h>
 #include <LibCore/System.h>
 #include <LibMain/Main.h>
 #include <LibPCIDB/Database.h>
@@ -88,37 +88,71 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         VERIFY(function_parts.size() == 2);
         auto function = convert_sysfs_value_to_uint(function_parts[1]);
 
-        auto vendor_id_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/vendor", dir));
-        if (!vendor_id_file->open(Core::OpenMode::ReadOnly)) {
-            dbgln("Error: Could not open {}: {}", vendor_id_file->name(), vendor_id_file->error_string());
+        auto vendor_id_filename = String::formatted("/sys/bus/pci/{}/vendor", dir);
+        auto vendor_id_file = Core::Stream::File::open(vendor_id_filename, Core::Stream::OpenMode::Read);
+        if (vendor_id_file.is_error()) {
+            dbgln("Error: Could not open {}: {}", vendor_id_filename, vendor_id_file.error());
             continue;
         }
-        auto device_id_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/device_id", dir));
-        if (!device_id_file->open(Core::OpenMode::ReadOnly)) {
-            dbgln("Error: Could not open {}: {}", device_id_file->name(), device_id_file->error_string());
+        auto device_id_filename = String::formatted("/sys/bus/pci/{}/device_id", dir);
+        auto device_id_file = Core::Stream::File::open(device_id_filename, Core::Stream::OpenMode::Read);
+        if (device_id_file.is_error()) {
+            dbgln("Error: Could not open {}: {}", device_id_filename, device_id_file.error());
             continue;
         }
-        auto class_id_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/class", dir));
-        if (!class_id_file->open(Core::OpenMode::ReadOnly)) {
-            dbgln("Error: Could not open {}: {}", class_id_file->name(), class_id_file->error_string());
+        auto class_id_filename = String::formatted("/sys/bus/pci/{}/class", dir);
+        auto class_id_file = Core::Stream::File::open(class_id_filename, Core::Stream::OpenMode::Read);
+        if (class_id_file.is_error()) {
+            dbgln("Error: Could not open {}: {}", class_id_filename, class_id_file.error());
             continue;
         }
-        auto subclass_id_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/subclass", dir));
-        if (!subclass_id_file->open(Core::OpenMode::ReadOnly)) {
-            dbgln("Error: Could not open {}: {}", subclass_id_file->name(), subclass_id_file->error_string());
+        auto subclass_id_filename = String::formatted("/sys/bus/pci/{}/subclass", dir);
+        auto subclass_id_file = Core::Stream::File::open(subclass_id_filename, Core::Stream::OpenMode::Read);
+        if (subclass_id_file.is_error()) {
+            dbgln("Error: Could not open {}: {}", subclass_id_filename, subclass_id_file.error());
             continue;
         }
-        auto revision_id_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/revision", dir));
-        if (!revision_id_file->open(Core::OpenMode::ReadOnly)) {
-            dbgln("Error: Could not open {}: {}", revision_id_file->name(), revision_id_file->error_string());
+        auto revision_id_filename = String::formatted("/sys/bus/pci/{}/revision", dir);
+        auto revision_id_file = Core::Stream::File::open(revision_id_filename, Core::Stream::OpenMode::Read);
+        if (revision_id_file.is_error()) {
+            dbgln("Error: Could not open {}: {}", revision_id_filename, revision_id_file.error());
             continue;
         }
 
-        u32 vendor_id = read_hex_string_from_bytebuffer(vendor_id_file->read_all());
-        u32 device_id = read_hex_string_from_bytebuffer(device_id_file->read_all());
-        u32 revision_id = read_hex_string_from_bytebuffer(revision_id_file->read_all());
-        u32 class_id = read_hex_string_from_bytebuffer(class_id_file->read_all());
-        u32 subclass_id = read_hex_string_from_bytebuffer(subclass_id_file->read_all());
+        auto vendor_id_contents = vendor_id_file.value()->read_all();
+        if (vendor_id_contents.is_error()) {
+            dbgln("Error: Could not read {}: {}", vendor_id_filename, vendor_id_contents.error());
+            continue;
+        }
+        u32 vendor_id = read_hex_string_from_bytebuffer(vendor_id_contents.value());
+
+        auto device_id_contents = device_id_file.value()->read_all();
+        if (device_id_contents.is_error()) {
+            dbgln("Error: Could not read {}: {}", device_id_filename, device_id_contents.error());
+            continue;
+        }
+        u32 device_id = read_hex_string_from_bytebuffer(device_id_contents.value());
+
+        auto revision_id_contents = revision_id_file.value()->read_all();
+        if (revision_id_contents.is_error()) {
+            dbgln("Error: Could not read {}: {}", revision_id_filename, revision_id_contents.error());
+            continue;
+        }
+        u32 revision_id = read_hex_string_from_bytebuffer(revision_id_contents.value());
+
+        auto class_id_contents = class_id_file.value()->read_all();
+        if (class_id_contents.is_error()) {
+            dbgln("Error: Could not read {}: {}", class_id_filename, class_id_contents.error());
+            continue;
+        }
+        u32 class_id = read_hex_string_from_bytebuffer(class_id_contents.value());
+
+        auto subclass_id_contents = subclass_id_file.value()->read_all();
+        if (subclass_id_contents.is_error()) {
+            dbgln("Error: Could not read {}: {}", subclass_id_filename, subclass_id_contents.error());
+            continue;
+        }
+        u32 subclass_id = read_hex_string_from_bytebuffer(subclass_id_contents.value());
 
         String vendor_name;
         String device_name;
@@ -142,12 +176,20 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         if (!flag_verbose)
             continue;
         for (size_t bar_index = 0; bar_index <= 5; bar_index++) {
-            auto bar_value_file = Core::File::construct(String::formatted("/sys/bus/pci/{}/bar{}", dir, bar_index));
-            if (!bar_value_file->open(Core::OpenMode::ReadOnly)) {
-                dbgln("Error: Could not open {}: {}", bar_value_file->name(), bar_value_file->error_string());
+            auto bar_value_filename = String::formatted("/sys/bus/pci/{}/bar{}", dir, bar_index);
+            auto bar_value_file = Core::Stream::File::open(bar_value_filename, Core::Stream::OpenMode::Read);
+            if (bar_value_file.is_error()) {
+                dbgln("Error: Could not open {}: {}", bar_value_filename, bar_value_file.error());
                 continue;
             }
-            u32 bar_value = read_hex_string_from_bytebuffer(bar_value_file->read_all());
+
+            auto bar_value_contents = bar_value_file.value()->read_all();
+            if (bar_value_contents.is_error()) {
+                dbgln("Error: Could not read {}: {}", bar_value_filename, bar_value_contents.error());
+                continue;
+            }
+
+            u32 bar_value = read_hex_string_from_bytebuffer(bar_value_contents.value());
             if (bar_value == 0)
                 continue;
             bool memory_region = ((bar_value & 1) == 0);