LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-27 05:05:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

chmod: Don't bail immediately on error

Browse Source 
Previously, chmod would exit immediately if there was an error
changing file permissions. We now print an error to stderr and
continue when an error occurs.
This commit is contained in:
Tim Ledbetter 2023-06-17 22:34:00 +01:00 committed by Andreas Kling
parent ead756ca32
commit 0cea1a3baf
Notes: sideshowbarker 2024-07-17 10:05:47 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/0cea1a3baf
Pull-request: https://github.com/SerenityOS/serenity/pull/19449
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Userland/Utilities/chmod.cpp
View File

@ -29,34 +29,51 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto mask = TRY(Core::FilePermissionsMask::parse(mode)); auto mask = TRY(Core::FilePermissionsMask::parse(mode));
Function<ErrorOr<void>(StringView const&)> update_path_permissions = [&](StringView const& path) -> ErrorOr<void> { Function<bool(StringView)> update_path_permissions = [&](StringView const& path) {
auto stat = TRY(Core::System::lstat(path)); auto stat_or_error = Core::System::lstat(path);
if (stat_or_error.is_error()) {
warnln("Could not stat '{}': {}", path, stat_or_error.release_error());
return false;
}
auto stat = stat_or_error.release_value();
if (S_ISLNK(stat.st_mode)) { if (S_ISLNK(stat.st_mode)) {
// Symlinks don't get processed unless they are explicitly listed on the command line. // Symlinks don't get processed unless they are explicitly listed on the command line.
if (!paths.contains_slow(path)) if (!paths.contains_slow(path))
return {}; return false;
// The chmod syscall changes the file that a link points to, so we will have to get // The chmod syscall changes the file that a link points to, so we will have to get
// the correct mode to base our modifications on. // the correct mode to base our modifications on.
stat = TRY(Core::System::stat(path)); stat_or_error = Core::System::stat(path);
if (stat_or_error.is_error()) {
warnln("Could not stat '{}': {}", path, stat_or_error.release_error());
return false;
}
stat = stat_or_error.release_value();
} }
TRY(Core::System::chmod(path, mask.apply(stat.st_mode))); auto success = true;
auto maybe_error = Core::System::chmod(path, mask.apply(stat.st_mode));
if (maybe_error.is_error()) {
warnln("Failed to change permissions of '{}': {}", path, maybe_error.release_error());
success = false;
}
if (recursive && S_ISDIR(stat.st_mode)) { if (recursive && S_ISDIR(stat.st_mode)) {
Core::DirIterator it(path, Core::DirIterator::Flags::SkipParentAndBaseDir); Core::DirIterator it(path, Core::DirIterator::Flags::SkipParentAndBaseDir);
while (it.has_next()) while (it.has_next())
TRY(update_path_permissions(it.next_full_path())); success &= update_path_permissions(it.next_full_path());
} }
return {}; return success;
}; };
auto success = true;
for (auto const& path : paths) { for (auto const& path : paths) {
TRY(update_path_permissions(path)); success &= update_path_permissions(path);
} }
return 0; return success ? 0 : 1;
} }