Everywhere: Use LibFileSystem where trivial

Userland/Utilities/CMakeLists.txt

@@ -80,6 +80,8 @@ target_link_libraries(chres PRIVATE LibGUI LibIPC)
 target_link_libraries(cksum PRIVATE LibCrypto)
 target_link_libraries(config PRIVATE LibConfig LibIPC)
 target_link_libraries(copy PRIVATE LibGUI)
+target_link_libraries(comm PRIVATE LibFileSystem)
+target_link_libraries(cp PRIVATE LibFileSystem)
 target_link_libraries(cpp-lexer PRIVATE LibCpp)
 target_link_libraries(cpp-parser PRIVATE LibCpp)
 target_link_libraries(cpp-preprocessor PRIVATE LibCpp)
@@ -90,26 +92,29 @@ target_link_libraries(fdtdump PRIVATE LibDeviceTree)
 target_link_libraries(file PRIVATE LibGfx LibIPC LibCompress LibAudio)
 target_link_libraries(functrace PRIVATE LibDebug LibX86)
 target_link_libraries(gml-format PRIVATE LibGUI)
-target_link_libraries(grep PRIVATE LibRegex)
+target_link_libraries(grep PRIVATE LibFileSystem LibRegex)
 target_link_libraries(gunzip PRIVATE LibCompress)
 target_link_libraries(gzip PRIVATE LibCompress)
-target_link_libraries(headless-browser PRIVATE LibCrypto LibGemini LibGfx LibHTTP LibTLS LibWeb LibWebView LibWebSocket LibIPC LibJS)
+target_link_libraries(headless-browser PRIVATE LibCrypto LibFileSystem LibGemini LibGfx LibHTTP LibTLS LibWeb LibWebView LibWebSocket LibIPC LibJS)
 target_link_libraries(icc PRIVATE LibGfx LibVideo)
 target_link_libraries(image PRIVATE LibGfx)
 target_link_libraries(image2bin PRIVATE LibGfx)
+target_link_libraries(ini PRIVATE LibFileSystem)
 target_link_libraries(jail-attach PRIVATE LibCore LibMain)
 target_link_libraries(jail-create PRIVATE LibCore LibMain)
 target_link_libraries(js PRIVATE LibCrypto LibJS LibLine LibLocale LibTextCodec)
 link_with_locale_data(js)
 target_link_libraries(keymap PRIVATE LibKeyboard)
 target_link_libraries(less PRIVATE LibLine)
+target_link_libraries(ls PRIVATE LibFileSystem)
 target_link_libraries(lspci PRIVATE LibPCIDB)
 target_link_libraries(lsusb PRIVATE LibUSBDB)
 target_link_libraries(lzcat PRIVATE LibCompress)
 target_link_libraries(man PRIVATE LibMarkdown LibManual)
-target_link_libraries(markdown-check PRIVATE LibMarkdown)
+target_link_libraries(markdown-check PRIVATE LibFileSystem LibMarkdown)
 target_link_libraries(matroska PRIVATE LibVideo)
 target_link_libraries(md PRIVATE LibMarkdown)
+target_link_libraries(mv PRIVATE LibFileSystem)
 target_link_libraries(notify PRIVATE LibGfx LibGUI)
 target_link_libraries(open PRIVATE LibDesktop)
 target_link_libraries(passwd PRIVATE LibCrypt)
@@ -117,29 +122,33 @@ target_link_libraries(paste PRIVATE LibGUI)
 target_link_libraries(pgrep PRIVATE LibRegex)
 target_link_libraries(pkill PRIVATE LibRegex)
 target_link_libraries(pls PRIVATE LibCrypt)
-target_link_libraries(pro PRIVATE LibProtocol LibHTTP)
-target_link_libraries(run-tests PRIVATE LibRegex LibCoredump LibDebug)
+target_link_libraries(pro PRIVATE LibFileSystem LibProtocol LibHTTP)
+target_link_libraries(run-tests PRIVATE LibCoredump LibDebug LibFileSystem LibRegex)
+target_link_libraries(rm PRIVATE LibFileSystem)
 target_link_libraries(sed PRIVATE LibRegex)
 target_link_libraries(shot PRIVATE LibGfx LibGUI LibIPC)
-target_link_libraries(sql PRIVATE LibLine LibSQL LibIPC)
+target_link_libraries(sql PRIVATE LibFileSystem LibIPC LibLine LibSQL)
 target_link_libraries(su PRIVATE LibCrypt)
 target_link_libraries(syscall PRIVATE LibSystem)
 target_link_libraries(ttfdisasm PRIVATE LibGfx)
-target_link_libraries(tar PRIVATE LibArchive LibCompress)
+target_link_libraries(tar PRIVATE LibArchive LibCompress LibFileSystem)
 target_link_libraries(telws PRIVATE LibProtocol LibLine)
 target_link_libraries(test-fuzz PRIVATE LibGemini LibGfx LibHTTP LibIPC LibJS LibMarkdown LibRegex LibShell)
 target_link_libraries(test-imap PRIVATE LibIMAP)
 target_link_libraries(test-pthread PRIVATE LibThreading)
+target_link_libraries(touch PRIVATE LibFileSystem)
 target_link_libraries(unveil PRIVATE LibMain)
-target_link_libraries(unzip PRIVATE LibArchive LibCompress LibCrypto)
+target_link_libraries(unzip PRIVATE LibArchive LibCompress LibCrypto LibFileSystem)
 target_link_libraries(update-cpp-test-results PRIVATE LibCpp)
 target_link_libraries(useradd PRIVATE LibCrypt)
+target_link_libraries(userdel PRIVATE LibFileSystem)
 target_link_libraries(wallpaper PRIVATE LibGfx LibGUI)
 target_link_libraries(wasm PRIVATE LibWasm LibLine LibJS)
+target_link_libraries(watch PRIVATE LibFileSystem)
 target_link_libraries(wsctl PRIVATE LibGUI LibIPC)
 target_link_libraries(xml PRIVATE LibXML)
 target_link_libraries(xzcat PRIVATE LibCompress)
-target_link_libraries(zip PRIVATE LibArchive LibCompress LibCrypto)
+target_link_libraries(zip PRIVATE LibArchive LibCompress LibCrypto LibFileSystem)
 
 # FIXME: Link this file into headless-browser without compiling it again.
 target_sources(headless-browser PRIVATE "${SerenityOS_SOURCE_DIR}/Userland/Services/WebContent/WebDriverConnection.cpp")

Userland/Utilities/comm.cpp

@@ -6,9 +6,9 @@
  */
 
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/File.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <string.h>
 #include <strings.h>
@@ -68,7 +68,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             return false;
         }
 
-        if (path != "-" && Core::DeprecatedFile::is_directory(path)) {
+        if (path != "-" && FileSystem::is_directory(path)) {
             warnln("Failed to open file{} '{}': is a directory", file_number, path);
             return false;
         }

Userland/Utilities/cp.cpp

@@ -8,6 +8,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -69,7 +70,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         TRY(Core::System::pledge("stdio rpath wpath cpath fattr"));
     }
 
-    bool destination_is_existing_dir = Core::DeprecatedFile::is_directory(destination);
+    bool destination_is_existing_dir = FileSystem::is_directory(destination);
 
     for (auto& source : sources) {
         auto destination_path = destination_is_existing_dir

Userland/Utilities/grep.cpp

@@ -11,10 +11,10 @@
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/File.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <LibRegex/Regex.h>
 #include <stdio.h>
@@ -245,7 +245,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
             Core::DirIterator it(recursive.value_or(base), Core::DirIterator::Flags::SkipDots);
             while (it.has_next()) {
                 auto path = it.next_full_path();
-                if (!Core::DeprecatedFile::is_directory(path)) {
+                if (!FileSystem::is_directory(path)) {
                     auto key = user_has_specified_files ? path.view() : path.substring_view(base.length() + 1, path.length() - base.length() - 1);
                     if (auto result = handle_file(key, true); result.is_error() && !suppress_errors)
                         warnln("Failed with file {}: {}", key, result.release_error());

Userland/Utilities/headless-browser.cpp

@@ -24,6 +24,7 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/File.h>
 #include <LibCore/Timer.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/PNGWriter.h>
@@ -164,8 +165,8 @@ static ErrorOr<NonnullRefPtr<Core::Timer>> load_page_for_screenshot_and_exit(Cor
     // FIXME: Allow passing the output path as an argument.
     static constexpr auto output_file_path = "output.png"sv;
 
-    if (Core::DeprecatedFile::exists(output_file_path))
-        TRY(Core::DeprecatedFile::remove(output_file_path, Core::DeprecatedFile::RecursionMode::Disallowed));
+    if (FileSystem::exists(output_file_path))
+        TRY(FileSystem::remove(output_file_path, FileSystem::RecursionMode::Disallowed));
 
     outln("Taking screenshot after {} seconds", screenshot_timeout);
 
@@ -191,7 +192,7 @@ static ErrorOr<NonnullRefPtr<Core::Timer>> load_page_for_screenshot_and_exit(Cor
 
 static ErrorOr<URL> format_url(StringView url)
 {
-    if (Core::DeprecatedFile::exists(url))
+    if (FileSystem::exists(url))
         return URL::create_with_file_scheme(Core::DeprecatedFile::real_path_for(url));
 
     URL formatted_url { url };

Userland/Utilities/ini.cpp

@@ -6,8 +6,8 @@
 
 #include <LibCore/ArgsParser.h>
 #include <LibCore/ConfigFile.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
@@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     args_parser.add_positional_argument(value_to_write, "Value to write", "value", Core::ArgsParser::Required::No);
     args_parser.parse(arguments);
 
-    if (!Core::DeprecatedFile::exists(path)) {
+    if (!FileSystem::exists(path)) {
         warnln("File does not exist: '{}'", path);
         return 1;
     }

Userland/Utilities/ls.cpp

@@ -18,6 +18,7 @@
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <ctype.h>
 #include <dirent.h>
@@ -164,7 +165,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     for (size_t i = 0; i < files.size(); i++) {
         auto path = files[i].name;
 
-        if (flag_recursive && Core::DeprecatedFile::is_directory(path)) {
+        if (flag_recursive && FileSystem::is_directory(path)) {
             size_t subdirs = 0;
             Core::DirIterator di(path, Core::DirIterator::SkipParentAndBaseDir);
 
@@ -175,7 +176,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
             while (di.has_next()) {
                 DeprecatedString directory = di.next_full_path();
-                if (Core::DeprecatedFile::is_directory(directory) && !Core::DeprecatedFile::is_link(directory)) {
+                if (FileSystem::is_directory(directory) && !FileSystem::is_link(directory)) {
                     ++subdirs;
                     FileMetadata new_file;
                     new_file.name = move(directory);
@@ -184,7 +185,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             }
         }
 
-        bool show_dir_separator = files.size() > 1 && Core::DeprecatedFile::is_directory(path) && !flag_list_directories_only;
+        bool show_dir_separator = files.size() > 1 && FileSystem::is_directory(path) && !flag_list_directories_only;
         if (show_dir_separator) {
             printf("%s:\n", path.characters());
         }

Userland/Utilities/markdown-check.cpp

@@ -21,6 +21,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/File.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <LibMarkdown/Document.h>
 #include <LibMarkdown/Visitor.h>
@@ -293,7 +294,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             } else {
                 pointee_file = LexicalPath::absolute_path(file_dir, file_link.file_path);
             }
-            if (!Core::DeprecatedFile::exists(pointee_file) && !is_missing_file_acceptable(pointee_file)) {
+            if (!FileSystem::exists(pointee_file) && !is_missing_file_acceptable(pointee_file)) {
                 outln("File '{}' points to '{}' (label '{}'), but '{}' does not exist!",
                     file_item.key, file_link.file_path, file_link.label, pointee_file);
                 any_problems = true;

Userland/Utilities/mv.cpp

@@ -9,6 +9,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <string.h>
@@ -69,7 +70,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             new_path = combined_new_path.characters();
         }
 
-        if (no_clobber && Core::DeprecatedFile::exists(new_path))
+        if (no_clobber && FileSystem::exists(new_path))
             continue;
 
         rc = rename(old_path.characters(), new_path.characters());

Userland/Utilities/pro.cpp

@@ -13,9 +13,9 @@
 #include <AK/String.h>
 #include <AK/URL.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibHTTP/HttpResponse.h>
 #include <LibMain/Main.h>
 #include <LibProtocol/Request.h>
@@ -337,7 +337,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
                         if (i > -1)
                             output_name = DeprecatedString::formatted("{}.{}", output_name, i);
                         ++i;
-                    } while (Core::DeprecatedFile::exists(output_name));
+                    } while (FileSystem::exists(output_name));
                 }
 
                 int target_file_fd = open(output_name.characters(), O_WRONLY | O_CREAT | O_TRUNC, 0644);

Userland/Utilities/rm.cpp

@@ -7,8 +7,8 @@
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -43,7 +43,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             continue;
         }
 
-        auto result = Core::DeprecatedFile::remove(path, recursive ? Core::DeprecatedFile::RecursionMode::Allowed : Core::DeprecatedFile::RecursionMode::Disallowed);
+        auto result = FileSystem::remove(path, recursive ? FileSystem::RecursionMode::Allowed : FileSystem::RecursionMode::Disallowed);
 
         if (result.is_error()) {
             auto error = result.release_error();

Userland/Utilities/run-tests.cpp

@@ -10,6 +10,7 @@
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
 #include <LibCoredump/Backtrace.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <LibRegex/Regex.h>
 #include <LibTest/TestRunner.h>
@@ -365,7 +366,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     } else {
         test_root = "/usr/Tests";
     }
-    if (!Core::DeprecatedFile::is_directory(test_root)) {
+    if (!FileSystem::is_directory(test_root)) {
         warnln("Test root is not a directory: {}", test_root);
         return 1;
     }

Userland/Utilities/sql.cpp

@@ -10,8 +10,8 @@
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/StandardPaths.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibLine/Editor.h>
 #include <LibMain/Main.h>
 #include <LibSQL/AST/Lexer.h>
@@ -365,7 +365,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     SQLRepl repl(loop, database_name, move(sql_client));
 
-    if (!suppress_sqlrc && Core::DeprecatedFile::exists(sqlrc_path))
+    if (!suppress_sqlrc && FileSystem::exists(sqlrc_path))
         repl.source_file(sqlrc_path);
     if (!file_to_source.is_empty())
         repl.source_file(file_to_source);

Userland/Utilities/tar.cpp

@@ -17,6 +17,7 @@
 #include <LibCore/DirIterator.h>
 #include <LibCore/Directory.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -278,9 +279,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             Core::DirIterator it(path, Core::DirIterator::Flags::SkipParentAndBaseDir);
             while (it.has_next()) {
                 auto child_path = it.next_full_path();
-                if (!dereference && Core::DeprecatedFile::is_link(child_path)) {
+                if (!dereference && FileSystem::is_link(child_path)) {
                     TRY(add_link(child_path));
-                } else if (!Core::DeprecatedFile::is_directory(child_path)) {
+                } else if (!FileSystem::is_directory(child_path)) {
                     TRY(add_file(child_path));
                 } else {
                     TRY(handle_directory(child_path, handle_directory));
@@ -291,7 +292,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         };
 
         for (auto const& path : paths) {
-            if (Core::DeprecatedFile::is_directory(path)) {
+            if (FileSystem::is_directory(path)) {
                 TRY(add_directory(path, add_directory));
             } else {
                 TRY(add_file(path));

Userland/Utilities/touch.cpp

@@ -9,8 +9,8 @@
 #include <AK/GenericLexer.h>
 #include <AK/Time.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <LibTimeZone/TimeZone.h>
 #include <ctype.h>
@@ -239,7 +239,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         atime.tv_nsec = UTIME_OMIT;
 
     for (auto path : paths) {
-        if (Core::DeprecatedFile::exists(path)) {
+        if (FileSystem::exists(path)) {
             if (utimensat(AT_FDCWD, path.characters(), times, 0) == -1)
                 err("failed to touch '{}': {}", path, strerror(errno));
         } else if (!no_create_file) {

Userland/Utilities/unzip.cpp

@@ -16,6 +16,7 @@
 #include <LibCore/MappedFile.h>
 #include <LibCore/System.h>
 #include <LibCrypto/Checksum/CRC32.h>
+#include <LibFileSystem/FileSystem.h>
 #include <sys/stat.h>
 
 static ErrorOr<void> adjust_modification_time(Archive::ZipMember const& zip_member)
@@ -94,7 +95,7 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
 
     if (checksum.digest() != zip_member.crc32) {
         warnln("Failed decompressing file {}: CRC32 mismatch", zip_member.name);
-        MUST(Core::DeprecatedFile::remove(zip_member.name, Core::DeprecatedFile::RecursionMode::Disallowed));
+        MUST(FileSystem::remove(zip_member.name, FileSystem::RecursionMode::Disallowed));
         return false;
     }
 

Userland/Utilities/userdel.cpp

@@ -10,6 +10,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <unistd.h>
 
@@ -54,7 +55,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             return 12;
         }
 
-        if (auto result = Core::DeprecatedFile::remove(real_path, Core::DeprecatedFile::RecursionMode::Allowed); result.is_error()) {
+        if (auto result = FileSystem::remove(real_path, FileSystem::RecursionMode::Allowed); result.is_error()) {
             warnln("{}", result.release_error());
             return 12;
         }

Userland/Utilities/watch.cpp

@@ -10,9 +10,9 @@
 #include <AK/Time.h>
 #include <AK/Vector.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/FileWatcher.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <errno.h>
 #include <spawn.h>
@@ -165,7 +165,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
         auto file_watcher = Core::BlockingFileWatcher();
         for (auto const& file : files_to_watch) {
-            if (!Core::DeprecatedFile::exists(file)) {
+            if (!FileSystem::exists(file)) {
                 warnln("Cannot watch '{}', it does not exist.", file);
                 return 1;
             }

Userland/Utilities/zip.cpp

@@ -10,11 +10,11 @@
 #include <LibCompress/Deflate.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/DateTime.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/File.h>
 #include <LibCore/System.h>
 #include <LibCrypto/Checksum/CRC32.h>
+#include <LibFileSystem/FileSystem.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
@@ -40,7 +40,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     TRY(Core::System::unveil(nullptr, nullptr));
 
     DeprecatedString zip_file_path { zip_path };
-    if (Core::DeprecatedFile::exists(zip_file_path)) {
+    if (FileSystem::exists(zip_file_path)) {
         if (force) {
             outln("{} already exists, overwriting...", zip_file_path);
         } else {
@@ -107,9 +107,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         Core::DirIterator it(path, Core::DirIterator::Flags::SkipParentAndBaseDir);
         while (it.has_next()) {
             auto child_path = it.next_full_path();
-            if (Core::DeprecatedFile::is_link(child_path))
+            if (FileSystem::is_link(child_path))
                 return {};
-            if (!Core::DeprecatedFile::is_directory(child_path)) {
+            if (!FileSystem::is_directory(child_path)) {
                 auto result = add_file(child_path);
                 if (result.is_error())
                     warnln("Couldn't add file '{}': {}", child_path, result.error());
@@ -123,7 +123,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     };
 
     for (auto const& source_path : source_paths) {
-        if (Core::DeprecatedFile::is_directory(source_path)) {
+        if (FileSystem::is_directory(source_path)) {
             auto result = add_directory(source_path, add_directory);
             if (result.is_error())
                 warnln("Couldn't add directory '{}': {}", source_path, result.error());