From 509e39ac00fb512fcd192e73b7d69564268d87a7 Mon Sep 17 00:00:00 2001 From: DragonAlex98 Date: Sun, 24 Jan 2021 00:43:33 +0100 Subject: [PATCH] FileManager: Make DirectoryView open links in their real directory Previously it was possible to open a link like /home/anon/Desktop/Home, leading to a folder with the same name. Now it correctly opens its real path, which is /home/anon FileManager: Use Core::File::real_path_for to get real path of links --- Userland/Applications/FileManager/DirectoryView.cpp | 7 +++++-- Userland/Applications/FileManager/main.cpp | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Userland/Applications/FileManager/DirectoryView.cpp b/Userland/Applications/FileManager/DirectoryView.cpp index ae30df2a4f..9e3595c5b1 100644 --- a/Userland/Applications/FileManager/DirectoryView.cpp +++ b/Userland/Applications/FileManager/DirectoryView.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -349,13 +350,15 @@ void DirectoryView::add_path_to_history(const StringView& path) void DirectoryView::open(const StringView& path) { - if (model().root_path() == path) { + auto real_path = Core::File::real_path_for(path); + + if (model().root_path() == real_path) { model().update(); return; } set_active_widget(¤t_view()); - model().set_root_path(path); + model().set_root_path(real_path); } void DirectoryView::set_status_message(const StringView& message) diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 703d93c91f..926491d5c5 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -114,9 +114,7 @@ int main(int argc, char** argv) String initial_location; if (argc >= 2) { - char* buffer = realpath(argv[1], nullptr); - initial_location = buffer; - free(buffer); + initial_location = Core::File::real_path_for(argv[1]); } if (initial_location.is_empty())