diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2023-05-07 21:10:29 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2023-05-13 07:53:13 +0200 |
| commit | bc2a517ade75145eac113c51acecb590a9de2a8c (patch) | |
| tree | b7ee5ab475dc81205a11828a7ac01f63c684bd60 | |
| parent | 0db94daf5e7f6b95a93fd878880d86d3baf6dd7f (diff) | |
| download | serenity-bc2a517ade75145eac113c51acecb590a9de2a8c.zip | |
Userland: Merge DEFAULT_PATH into LibFileSystem/FileSystem.h
| -rw-r--r-- | Userland/Libraries/LibCore/DeprecatedFile.cpp | 1 | ||||
| -rw-r--r-- | Userland/Libraries/LibCore/DeprecatedFile.h | 4 | ||||
| -rw-r--r-- | Userland/Services/ChessEngine/ChessEngine.cpp | 1 | ||||
| -rw-r--r-- | Userland/Services/TelnetServer/main.cpp | 2 | ||||
| -rw-r--r-- | Userland/Shell/Builtin.cpp | 1 | ||||
| -rw-r--r-- | Userland/Shell/Shell.cpp | 1 |
6 files changed, 4 insertions, 6 deletions
diff --git a/Userland/Libraries/LibCore/DeprecatedFile.cpp b/Userland/Libraries/LibCore/DeprecatedFile.cpp index 15a5856a4a..f4e18665d9 100644 --- a/Userland/Libraries/LibCore/DeprecatedFile.cpp +++ b/Userland/Libraries/LibCore/DeprecatedFile.cpp @@ -10,6 +10,7 @@ #include <LibCore/DeprecatedFile.h> #include <LibCore/DirIterator.h> #include <LibCore/System.h> +#include <LibFileSystem/FileSystem.h> #include <errno.h> #include <fcntl.h> #include <libgen.h> diff --git a/Userland/Libraries/LibCore/DeprecatedFile.h b/Userland/Libraries/LibCore/DeprecatedFile.h index cd871b7822..eddf381315 100644 --- a/Userland/Libraries/LibCore/DeprecatedFile.h +++ b/Userland/Libraries/LibCore/DeprecatedFile.h @@ -11,10 +11,6 @@ #include <LibCore/IODevice.h> #include <sys/stat.h> -// FIXME: Make this a bit prettier. -#define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin" -#define DEFAULT_PATH_SV "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv - namespace Core { /// diff --git a/Userland/Services/ChessEngine/ChessEngine.cpp b/Userland/Services/ChessEngine/ChessEngine.cpp index e68e45e67b..e415e1b55e 100644 --- a/Userland/Services/ChessEngine/ChessEngine.cpp +++ b/Userland/Services/ChessEngine/ChessEngine.cpp @@ -7,7 +7,6 @@ #include "ChessEngine.h" #include "MCTSTree.h" #include <AK/Random.h> -#include <LibCore/DeprecatedFile.h> #include <LibCore/ElapsedTimer.h> using namespace Chess::UCI; diff --git a/Userland/Services/TelnetServer/main.cpp b/Userland/Services/TelnetServer/main.cpp index 1481f02859..d2b8620f5e 100644 --- a/Userland/Services/TelnetServer/main.cpp +++ b/Userland/Services/TelnetServer/main.cpp @@ -9,10 +9,10 @@ #include <AK/HashMap.h> #include <AK/Types.h> #include <LibCore/ArgsParser.h> -#include <LibCore/DeprecatedFile.h> #include <LibCore/EventLoop.h> #include <LibCore/Socket.h> #include <LibCore/TCPServer.h> +#include <LibFileSystem/FileSystem.h> #include <LibMain/Main.h> #include <fcntl.h> #include <stdio.h> diff --git a/Userland/Shell/Builtin.cpp b/Userland/Shell/Builtin.cpp index 47f56dbf51..e7ebcc099c 100644 --- a/Userland/Shell/Builtin.cpp +++ b/Userland/Shell/Builtin.cpp @@ -16,6 +16,7 @@ #include <LibCore/DeprecatedFile.h> #include <LibCore/EventLoop.h> #include <LibCore/File.h> +#include <LibFileSystem/FileSystem.h> #include <errno.h> #include <inttypes.h> #include <limits.h> diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp index 32d7280d5d..7471a8f248 100644 --- a/Userland/Shell/Shell.cpp +++ b/Userland/Shell/Shell.cpp @@ -25,6 +25,7 @@ #include <LibCore/EventLoop.h> #include <LibCore/System.h> #include <LibCore/Timer.h> +#include <LibFileSystem/FileSystem.h> #include <LibLine/Editor.h> #include <Shell/PosixParser.h> #include <errno.h> |