RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:27:45 +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

8
Userland/Libraries/LibCore/System.cpp
View file

@ -393,7 +393,7 @@ ErrorOr<void> chown(StringView pathname, uid_t uid, gid_t gid)
#endif #endif
} }
ErrorOr<struct passwd> getpwnam(StringView name) ErrorOr<Optional<struct passwd>> getpwnam(StringView name)
{ {
::setpwent(); ::setpwent();
if (errno) if (errno)
@ -408,10 +408,10 @@ ErrorOr<struct passwd> getpwnam(StringView name)
if (errno) if (errno)
return Error::from_syscall("getpwnam"sv, -errno); return Error::from_syscall("getpwnam"sv, -errno);
else else
return Error::from_string_literal("getpwnam: Unknown username"sv); return Optional<struct passwd> {};
} }
ErrorOr<struct group> getgrnam(StringView name) ErrorOr<Optional<struct group>> getgrnam(StringView name)
{ {
::setgrent(); ::setgrent();
if (errno) if (errno)
@ -426,7 +426,7 @@ ErrorOr<struct group> getgrnam(StringView name)
if (errno) if (errno)
return Error::from_syscall("getgrnam"sv, -errno); return Error::from_syscall("getgrnam"sv, -errno);
else else
return Error::from_string_literal("getgrnam: Unknown username"sv); return Optional<struct group> {};
} }
ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts) ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts)

4
Userland/Libraries/LibCore/System.h
View file

@ -68,8 +68,8 @@ ErrorOr<struct termios> tcgetattr(int fd);
ErrorOr<void> tcsetattr(int fd, int optional_actions, struct termios const&); ErrorOr<void> tcsetattr(int fd, int optional_actions, struct termios const&);
ErrorOr<void> chmod(StringView pathname, mode_t mode); ErrorOr<void> chmod(StringView pathname, mode_t mode);
ErrorOr<void> chown(StringView pathname, uid_t uid, gid_t gid); ErrorOr<void> chown(StringView pathname, uid_t uid, gid_t gid);
ErrorOr<struct passwd> getpwnam(StringView name); ErrorOr<Optional<struct passwd>> getpwnam(StringView name);
ErrorOr<struct group> getgrnam(StringView name); ErrorOr<Optional<struct group>> getgrnam(StringView name);
ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts); ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts);
ErrorOr<pid_t> posix_spawnp(StringView const path, posix_spawn_file_actions_t* const file_actions, posix_spawnattr_t* const attr, char* const arguments[], char* const envp[]); ErrorOr<pid_t> posix_spawnp(StringView const path, posix_spawn_file_actions_t* const file_actions, posix_spawnattr_t* const attr, char* const arguments[], char* const envp[]);
ErrorOr<pid_t> waitpid(pid_t waitee, int* wstatus, int options); ErrorOr<pid_t> waitpid(pid_t waitee, int* wstatus, int options);

12
Userland/Utilities/chown.cpp
View file

@ -42,7 +42,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
new_uid = number.value(); new_uid = number.value();
} else { } else {
auto passwd = TRY(Core::System::getpwnam(parts[0])); 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) { if (parts.size() == 2) {
@ -51,7 +55,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
new_gid = number.value(); new_gid = number.value();
} else { } else {
auto group = TRY(Core::System::getgrnam(parts[1])); 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;
} }
} }