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

Userland: Use Core::File::read_link()

Browse source
This commit is contained in:
Sergey Bugaev 2020-06-16 22:01:50 +03:00 • committed by Andreas Kling
parent d89843f96f
commit eb7af00152
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/ls.cpp
View file

@ -33,6 +33,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DateTime.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@ -208,13 +209,11 @@ size_t print_name(const struct stat& st, const String& name, const char* path_fo
}
if (S_ISLNK(st.st_mode)) {
if (path_for_link_resolution) {
char linkbuf[PATH_MAX];
ssize_t nread = readlink(path_for_link_resolution, linkbuf, sizeof(linkbuf) - 1);
if (nread < 0) {
perror("readlink failed");
auto link_destination = Core::File::read_link(path_for_link_resolution);
if (link_destination.is_null()) {
perror("readlink");
} else {
linkbuf[nread] = '\0';
nprinted += printf(" -> ") + print_escaped(linkbuf);
nprinted += printf(" -> ") + print_escaped(link_destination.characters());
}
} else {
nprinted += printf("@");

6
Userland/test_io.cpp
View file

@ -27,6 +27,7 @@
#include <AK/Assertions.h>
#include <AK/LogStream.h>
#include <AK/Types.h>
#include <LibCore/File.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
@ -212,9 +213,8 @@ void test_unlink_symlink()
ASSERT_NOT_REACHED();
}
char buffer[PATH_MAX];
rc = readlink("/tmp/linky", buffer, sizeof(buffer));
ASSERT(rc == strlen("/proc/2/foo"));
auto target = Core::File::read_link("/tmp/linky");
ASSERT(target == "/proc/2/foo");
rc = unlink("/tmp/linky");
if (rc < 0) {