0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-04 21:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Userland: Simplify recursion in find(1)

Browse source 
Now walk_tree() itself checks whether it should descend into a file
(if the file is a directory) or not.
This commit is contained in:
Sergey Bugaev 2021-08-18 15:07:26 +03:00 committed by Andreas Kling
parent ad15d0c880
commit d4232d5ee2
Notes: sideshowbarker 2024-07-18 05:31:49 +09:00 
Author: https://github.com/bugaevc
Commit: https://github.com/SerenityOS/serenity/commit/d4232d5ee26
Pull-request: https://github.com/SerenityOS/serenity/pull/9489
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/Utilities/find.cpp
View file

@ -461,9 +461,28 @@ static void walk_tree(const FileData& root_data, Command& command)
{
command.evaluate(root_data);
int dirfd = openat(root_data.dirfd, root_data.basename, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
if (dirfd < 0 && errno == ENOTDIR)
// We should try to read directory entries if either:
// * This is a directory.
// * This is a symlink (that could point to a directory),
// and we're following symlinks.
struct stat stat;
int rc = fstatat(root_data.dirfd, root_data.basename, &stat, AT_SYMLINK_NOFOLLOW);
if (rc < 0)
return;
if (!S_ISDIR(stat.st_mode) && (!g_follow_symlinks || !S_ISLNK(stat.st_mode)))
return;
int dirfd = openat(root_data.dirfd, root_data.basename, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
if (dirfd < 0) {
if (errno == ENOTDIR) {
// Above we decided to try to open this file because it could
// be a directory, but turns out it's not. This is fine though.
return;
}
perror(root_data.full_path.string().characters());
g_there_was_an_error = true;
return;
}
DIR* dir = fdopendir(dirfd);
@ -481,11 +500,7 @@ static void walk_tree(const FileData& root_data, Command& command)
dirfd,
dirent->d_name,
};
struct stat stat;
if (g_follow_symlinks || fstatat(dirfd, dirent->d_name, &stat, AT_SYMLINK_NOFOLLOW) < 0 || !S_ISLNK(stat.st_mode))
walk_tree(file_data, command);
else
command.evaluate(file_data);
walk_tree(file_data, command);
}
if (errno != 0) {