RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00
Code Issues Activity Actions

Utilities: Add support for relative paths in open command

Browse source
This commit is contained in:
Filip Kania 2021-06-02 13:14:52 +02:00 • committed by Ali Mohammad Pur
parent b15a5d6ada
commit 33cdc59dff
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Utilities/open.cpp
View file

@ -11,7 +11,6 @@
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibDesktop/Launcher.h> #include <LibDesktop/Launcher.h>
#include <string.h>
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
@ -25,21 +24,8 @@ int main(int argc, char* argv[])
bool all_ok = true; bool all_ok = true;
for (auto& url_or_path : urls_or_paths) { for (auto& url_or_path : urls_or_paths) {
auto url = URL::create_with_url_or_path(url_or_path); auto path = Core::File::real_path_for(url_or_path);
auto url = URL::create_with_url_or_path(path.is_null() ? url_or_path : path);
if (url.protocol() == "file") {
// 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()) {
// errno *should* be preserved from Core::File::real_path_for().
warnln("Failed to open '{}': {}", url.path(), strerror(errno));
all_ok = false;
continue;
}
url = URL::create_with_url_or_path(real_path);
}
if (!Desktop::Launcher::open(url)) { if (!Desktop::Launcher::open(url)) {
warnln("Failed to open '{}'", url); warnln("Failed to open '{}'", url);