RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:48:14 +00:00
Code Issues Activity Actions

open: Fix opening "." (again)

Browse source 
We can't always rely on the initial URL's path(), so use either the
user-specified argument or the URL path for determining the realpath,
depending on whether we got a file:// URL argument.

Fixes #4950.
This commit is contained in:
Linus Groh 2021-03-07 17:14:58 +01:00 • committed by Andreas Kling
parent 501952852c
commit 3532e1788f
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Utilities/open.cpp
View file

@ -48,7 +48,10 @@ int main(int argc, char* argv[])
auto url = URL::create_with_url_or_path(url_or_path); auto url = URL::create_with_url_or_path(url_or_path);
if (url.protocol() == "file") { if (url.protocol() == "file") {
auto real_path = Core::File::real_path_for(url.path()); // NOTE: Since URL::create_with_url_or_path() returns "file:///" for ".", and we chose
// to fix that in open(1) itself using Core::File::real_path_for(), we have to
// conditionally chose either the URL's path or user-specified argument (also a path).
auto real_path = Core::File::real_path_for(StringView(url_or_path).starts_with("file://") ? url.path() : url_or_path);
if (real_path.is_null()) { if (real_path.is_null()) {
// errno *should* be preserved from Core::File::real_path_for(). // errno *should* be preserved from Core::File::real_path_for().
warnln("Failed to open '{}': {}", url.path(), strerror(errno)); warnln("Failed to open '{}': {}", url.path(), strerror(errno));