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

LibCore+chown: Return ErrorOr<Optional<...>> for getgrnam and getpwnam

Browse source 
This patch returns an empty Optional<...> instead of an Error for
Core::System::getgrname and Core::System::getpwnam if we can't find a
matching group or user entry.

It also updates the 'chown' utility to support this new behavior.
This commit is contained in:
Kenneth Myhra 2021-12-23 09:41:00 +01:00 • committed by Andreas Kling
parent ab324c1dae
commit 7772309169
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/chown.cpp
View file

@ -42,7 +42,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
new_uid = number.value();
} else {
auto passwd = TRY(Core::System::getpwnam(parts[0]));
new_uid = passwd.pw_uid;
if (!passwd.has_value()) {
warnln("Unknown user '{}'", parts[0]);
return 1;
}
new_uid = passwd->pw_uid;
}
if (parts.size() == 2) {
@ -51,7 +55,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
new_gid = number.value();
} else {
auto group = TRY(Core::System::getgrnam(parts[1]));
new_gid = group.gr_gid;
if (!group.has_value()) {
warnln("Unknown group '{}'", parts[1]);
return 1;
}
new_gid = group->gr_gid;
}
}