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

du: Don't fail immediately when directory can't be read (#8719)

Browse source
This commit is contained in:
luk1337 2021-07-13 17:30:38 +02:00 • committed by GitHub
parent 77795b2c8f
commit 334499a3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Utilities/du.cpp
View file

@ -136,11 +136,13 @@ int print_space_usage(const String& path, const DuOption& du_option, int max_dep
return 1; return 1;
} }
int ret = 0;
if (--max_depth >= 0 && S_ISDIR(path_stat.st_mode)) { if (--max_depth >= 0 && S_ISDIR(path_stat.st_mode)) {
auto di = Core::DirIterator(path, Core::DirIterator::SkipParentAndBaseDir); auto di = Core::DirIterator(path, Core::DirIterator::SkipParentAndBaseDir);
if (di.has_error()) { if (di.has_error()) {
warnln("DirIterator: {}", di.error_string()); warnln("du: cannot read directory '{}': {}", path, di.error_string());
return 1; ret = 1;
} }
while (di.has_next()) { while (di.has_next()) {
const auto child_path = di.next_full_path(); const auto child_path = di.next_full_path();
@ -193,5 +195,5 @@ int print_space_usage(const String& path, const DuOption& du_option, int max_dep
outln("\t{}\t{}", formatted_time, path); outln("\t{}\t{}", formatted_time, path);
} }
return 0; return ret;
} }