RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:57:35 +00:00
Code Issues Activity Actions

AK: Add a canonicalized_path() convenience function.

Browse source 
This is the same as calling FileSystemPath(foo).string(). The majority of
clients only care about canonicalizing a path, so let's have an easy way
to express that.
This commit is contained in:
Andreas Kling 2019-07-15 06:49:28 +02:00
parent cd497accbe
commit 954a0b8efe
7 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Applications/FileManager/DirectoryView.cpp
View file

@ -10,14 +10,14 @@ void DirectoryView::handle_activation(const GModelIndex& index)
return;
dbgprintf("on activation: %d,%d, this=%p, m_model=%p\n", index.row(), index.column(), this, m_model.ptr());
auto& entry = model().entry(index.row());
FileSystemPath path(String::format("%s/%s", model().path().characters(), entry.name.characters()));
auto path = canonicalized_path(String::format("%s/%s", model().path().characters(), entry.name.characters()));
if (entry.is_directory()) {
open(path.string());
open(path);
return;
}
if (entry.is_executable()) {
if (fork() == 0) {
int rc = execl(path.string().characters(), path.string().characters(), nullptr);
int rc = execl(path.characters(), path.characters(), nullptr);
if (rc < 0)
perror("exec");
ASSERT_NOT_REACHED();
@ -25,9 +25,9 @@ void DirectoryView::handle_activation(const GModelIndex& index)
return;
}
if (path.string().to_lowercase().ends_with(".png")) {
if (path.to_lowercase().ends_with(".png")) {
if (fork() == 0) {
int rc = execl("/bin/qs", "/bin/qs", path.string().characters(), nullptr);
int rc = execl("/bin/qs", "/bin/qs", path.characters(), nullptr);
if (rc < 0)
perror("exec");
ASSERT_NOT_REACHED();
@ -36,7 +36,7 @@ void DirectoryView::handle_activation(const GModelIndex& index)
}
if (fork() == 0) {
int rc = execl("/bin/TextEditor", "/bin/TextEditor", path.string().characters(), nullptr);
int rc = execl("/bin/TextEditor", "/bin/TextEditor", path.characters(), nullptr);
if (rc < 0)
perror("exec");
ASSERT_NOT_REACHED();

8
Applications/FileManager/main.cpp
View file

@ -91,10 +91,10 @@ int main(int argc, char** argv)
auto mkdir_action = GAction::create("New directory...", GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [&](const GAction&) {
GInputBox input_box("Enter name:", "New directory", window);
if (input_box.exec() == GInputBox::ExecOK && !input_box.text_value().is_empty()) {
auto new_dir_path = FileSystemPath(String::format("%s/%s",
directory_view->path().characters(),
input_box.text_value().characters()))
.string();
auto new_dir_path = canonicalized_path(
String::format("%s/%s",
directory_view->path().characters(),
input_box.text_value().characters()));
int rc = mkdir(new_dir_path.characters(), 0777);
if (rc < 0) {
GMessageBox::show(String::format("mkdir(\"%s\") failed: %s", new_dir_path.characters(), strerror(errno)), "Error", GMessageBox::Type::Error, window);