shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-09 09:57:26 +03:00
Code

path-lookup: try harder acquiring them $HOME of a user

Browse Source 
Let's use get_home_dir() for figuring out the home directory, so that
there's a good chance we succeed figuring out unit locations even if
$HOME isn't set.

Fixes: #5260
This commit is contained in:
Lennart Poettering 2017-02-10 15:16:11 +01:00
parent d0fd66a379
commit c49970743e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/path-lookup.c
View File

@ -33,6 +33,7 @@
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "user-util.h"
#include "util.h"
static int user_runtime_dir(char **ret, const char *suffix) {
@ -57,6 +58,7 @@ static int user_runtime_dir(char **ret, const char *suffix) {
static int user_config_dir(char **ret, const char *suffix) {
const char *e;
char *j;
int r;
assert(ret);
@ -64,11 +66,11 @@ static int user_config_dir(char **ret, const char *suffix) {
if (e)
j = strappend(e, suffix);
else {
const char *home;
_cleanup_free_ char *home = NULL;
home = getenv("HOME");
if (!home)
return -ENXIO;
r = get_home_dir(&home);
if (r < 0)
return r;
j = strjoin(home, "/.config", suffix);
}
@ -83,6 +85,7 @@ static int user_config_dir(char **ret, const char *suffix) {
static int user_data_dir(char **ret, const char *suffix) {
const char *e;
char *j;
int r;
assert(ret);
assert(suffix);
@ -95,12 +98,11 @@ static int user_data_dir(char **ret, const char *suffix) {
if (e)
j = strappend(e, suffix);
else {
const char *home;
home = getenv("HOME");
if (!home)
return -ENXIO;
_cleanup_free_ char *home = NULL;
r = get_home_dir(&home);
if (r < 0)
return r;
j = strjoin(home, "/.local/share", suffix);
}