oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ConfigPath: use standard directory API

This commit is contained in:
Denis Krjuchkov 2013-12-07 03:38:56 +06:00
parent 5d85792178
commit ae25582178
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ConfigPath.cxx
View File

@ -22,6 +22,7 @@
#include "fs/AllocatedPath.hxx"
#include "fs/Traits.hxx"
#include "fs/Domain.hxx"
#include "fs/StandardDirectory.hxx"
#include "util/Error.hxx"
#include "ConfigGlobal.hxx"
@ -39,14 +40,14 @@
static AllocatedPath
GetHome(const char *user, Error &error)
{
passwd *pw = getpwnam(user);
if (pw == nullptr) {
AllocatedPath result = GetHomeDir(user);
if (result.IsNull()) {
error.Format(path_domain,
"no such user: %s", user);
return AllocatedPath::Null();
}
return AllocatedPath::FromFS(pw->pw_dir);
return result;
}
/**
@ -55,14 +56,14 @@ GetHome(const char *user, Error &error)
static AllocatedPath
GetHome(Error &error)
{
const char *home = g_get_home_dir();
if (home == nullptr) {
AllocatedPath result = GetHomeDir();
if (result.IsNull()) {
error.Set(path_domain,
"problems getting home for current user");
return AllocatedPath::Null();
}
return AllocatedPath::FromUTF8(home, error);
return result;
}
/**