diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-03-15 01:00:34 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-03-15 04:09:44 +0000 |
| commit | b6b0cfaafd5dd9685e636c9b46346ee8de68d68c (patch) | |
| tree | 29f6ac86990df03c08af98e5a2f9d2ba0d332c7a /src/libsystemd/sd-path | |
| parent | 70e43ee7be6ee8d1e8aa4b2984a72baa25709c2e (diff) | |
| download | systemd-b6b0cfaafd5dd9685e636c9b46346ee8de68d68c.tar.gz systemd-b6b0cfaafd5dd9685e636c9b46346ee8de68d68c.tar.bz2 systemd-b6b0cfaafd5dd9685e636c9b46346ee8de68d68c.zip | |
sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirs
Diffstat (limited to 'src/libsystemd/sd-path')
| -rw-r--r-- | src/libsystemd/sd-path/sd-path.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index 480f1ad065..b7aec1f20a 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -89,7 +89,8 @@ static int from_home_dir(const char *envname, const char *suffix, char **buffer, static int from_user_dir(const char *field, char **buffer, const char **ret) { _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ char *b = NULL; - const char *fn = NULL; + _cleanup_free_ const char *fn = NULL; + const char *c = NULL; char line[LINE_MAX]; size_t n; int r; @@ -98,10 +99,14 @@ static int from_user_dir(const char *field, char **buffer, const char **ret) { assert(buffer); assert(ret); - r = from_home_dir(NULL, ".config/user-dirs.dirs", &b, &fn); + r = from_home_dir("XDG_CONFIG_HOME", ".config", &b, &c); if (r < 0) return r; + fn = strappend(c, "/user-dirs.dirs"); + if (!fn) + return -ENOMEM; + f = fopen(fn, "re"); if (!f) { if (errno == ENOENT) |