diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2023-02-09 03:02:46 +0100 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2023-02-13 00:50:07 +0000 |
| commit | 606a3982f34d777f121fcc4aa964141199676c20 (patch) | |
| tree | 836fef41d11f1b77f4dac7d699e5c9f720ee4ff1 /Ports | |
| parent | a96339b72b3b417ffaa4fbb4e7575149f749acaa (diff) | |
| download | serenity-606a3982f34d777f121fcc4aa964141199676c20.zip | |
LibCore: Move Stream-based file into the `Core` namespace
Diffstat (limited to 'Ports')
| -rw-r--r-- | Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch b/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch index 50763e01ce..15fd209e62 100644 --- a/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch +++ b/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch @@ -50,7 +50,7 @@ new file mode 100644 index 0000000000000000000000000000000000000000..cc0c08cb85a682d66a00f6b48ad2871f83b5e719 --- /dev/null +++ b/src/java.base/serenity/native/libjava/ProcessHandleImpl_serenity.cpp -@@ -0,0 +1,165 @@ +@@ -0,0 +1,166 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,6 +89,7 @@ index 0000000000000000000000000000000000000000..cc0c08cb85a682d66a00f6b48ad2871f + +#include <AK/JsonArray.h> +#include <LibCore/DeprecatedFile.h> ++#include <LibCore/File.h> +#include <LibCore/ProcessStatisticsReader.h> +#include <LibCore/Stream.h> +#include <stdio.h> @@ -189,7 +190,7 @@ index 0000000000000000000000000000000000000000..cc0c08cb85a682d66a00f6b48ad2871f + unix_getUserInfo(env, jinfo, proc.pid); + JNU_CHECK_EXCEPTION(env); + -+ auto cmdline_file = JAVA_TRY(Core::Stream::File::open(DeprecatedString::formatted("/proc/{}/cmdline", pid), Core::Stream::OpenMode::Read), "Unable to open /proc/pid/cmdline"sv); ++ auto cmdline_file = JAVA_TRY(Core::File::open(DeprecatedString::formatted("/proc/{}/cmdline", pid), Core::File::OpenMode::Read), "Unable to open /proc/pid/cmdline"sv); + auto contents = JAVA_TRY(cmdline_file->read_until_eof(), "Unable to read /proc/pid/cmdline"sv); + auto cmdline = JAVA_TRY(JsonValue::from_string(contents), "Invalid JSON in /proc/pid/cmdline"sv); + |