From 376b5731a212cb2082169638192db5166f93f8c6 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 14 Sep 2022 15:49:39 +0100 Subject: [PATCH] lsof: Port to Core::Stream --- Userland/Utilities/lsof.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Userland/Utilities/lsof.cpp b/Userland/Utilities/lsof.cpp index 9c280ec33f..46e9aaad97 100644 --- a/Userland/Utilities/lsof.cpp +++ b/Userland/Utilities/lsof.cpp @@ -11,8 +11,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -65,14 +65,18 @@ static bool parse_name(StringView name, OpenFile& file) static Vector get_open_files_by_pid(pid_t pid) { - auto file = Core::File::open(String::formatted("/proc/{}/fds", pid), Core::OpenMode::ReadOnly); + auto file = Core::Stream::File::open(String::formatted("/proc/{}/fds", pid), Core::Stream::OpenMode::Read); if (file.is_error()) { outln("lsof: PID {}: {}", pid, file.error()); return Vector(); } auto data = file.value()->read_all(); + if (data.is_error()) { + outln("lsof: PID {}: {}", pid, data.error()); + return {}; + } - auto json_or_error = JsonValue::from_string(data); + auto json_or_error = JsonValue::from_string(data.value()); if (json_or_error.is_error()) { outln("lsof: {}", json_or_error.error()); return Vector();