0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions2

LibCore: Replace Result<T, E> use with ErrorOr<T> in Core::Account

Browse source
This commit is contained in:
Andreas Kling 2021-11-07 11:41:48 +01:00
parent 01a6a4f7c4
commit 4eeab4cfc8
Notes: sideshowbarker 2024-07-18 01:23:27 +09:00
2 changed files with 10 additions and 13 deletions
Userland/Libraries/LibCore
Account.cppAccount.h

16
Userland/Libraries/LibCore/Account.cpp
View file

@ -55,7 +55,7 @@ static Vector<gid_t> get_extra_gids(const passwd& pwd)
return extra_gids;
}
Result<Account, String> Account::from_passwd(const passwd& pwd, const spwd& spwd)
ErrorOr<Account> Account::from_passwd(const passwd& pwd, const spwd& spwd)
{
Account account(pwd, spwd, get_extra_gids(pwd));
endpwent();
@ -107,15 +107,14 @@ Account Account::self(Read options)
return Account(*pwd, *spwd, extra_gids);
}
Result<Account, String> Account::from_name(const char* username, Read options)
ErrorOr<Account> Account::from_name(const char* username, Read options)
{
errno = 0;
auto* pwd = getpwnam(username);
if (!pwd) {
if (errno == 0)
return String("No such user");
return String(strerror(errno));
return Error::from_string_literal("No such user"sv);
return Error::from_errno(errno);
}
spwd spwd_dummy = {};
spwd_dummy.sp_namp = const_cast<char*>(username);
@ -133,15 +132,14 @@ Result<Account, String> Account::from_name(const char* username, Read options)
return from_passwd(*pwd, *spwd);
}
Result<Account, String> Account::from_uid(uid_t uid, Read options)
ErrorOr<Account> Account::from_uid(uid_t uid, Read options)
{
errno = 0;
auto* pwd = getpwuid(uid);
if (!pwd) {
if (errno == 0)
return String("No such user");
return String(strerror(errno));
return Error::from_string_literal("No such user"sv);
return Error::from_errno(errno);
}
spwd spwd_dummy = {};
spwd_dummy.sp_namp = pwd->pw_name;

7
Userland/Libraries/LibCore/Account.h
View file

@ -6,7 +6,6 @@
#pragma once
#include <AK/Result.h>
#include <AK/String.h>
#include <AK/Types.h>
#include <AK/Vector.h>
@ -34,8 +33,8 @@ public:
};
static Account self(Read options = Read::All);
static Result<Account, String> from_name(const char* username, Read options = Read::All);
static Result<Account, String> from_uid(uid_t uid, Read options = Read::All);
static ErrorOr<Account> from_name(char const* username, Read options = Read::All);
static ErrorOr<Account> from_uid(uid_t uid, Read options = Read::All);
bool authenticate(SecretString const& password) const;
bool login() const;
@ -68,7 +67,7 @@ public:
bool sync();
private:
static Result<Account, String> from_passwd(const passwd&, const spwd&);
static ErrorOr<Account> from_passwd(passwd const&, spwd const&);
Account(const passwd& pwd, const spwd& spwd, Vector<gid_t> extra_gids);