diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-05-27 16:27:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-27 17:05:38 +0200 |
| commit | 4ede980249bf3cf4e831efc76ed36716a8143f17 (patch) | |
| tree | 47631338137bc24dc7cdc5670d28f676d8af346d /src/libsystemd/sd-path | |
| parent | 7ae2768028ce9cfa2f4f22b459637e2f78ce1838 (diff) | |
| download | systemd-4ede980249bf3cf4e831efc76ed36716a8143f17.tar.gz | |
tree-wide: make use of path_extend() at many places
This is not a comprehensive port, but mostly some low-hanging fruit.
Diffstat (limited to 'src/libsystemd/sd-path')
| -rw-r--r-- | src/libsystemd/sd-path/sd-path.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index 4fe0903c1d..ff1e0d5f8e 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -37,7 +37,6 @@ static int from_environment(const char *envname, const char *fallback, const cha static int from_home_dir(const char *envname, const char *suffix, char **buffer, const char **ret) { _cleanup_free_ char *h = NULL; - char *cc = NULL; int r; assert(suffix); @@ -58,12 +57,11 @@ static int from_home_dir(const char *envname, const char *suffix, char **buffer, if (r < 0) return r; - cc = path_join(h, suffix); - if (!cc) + if (!path_extend(&h, suffix)) return -ENOMEM; - *buffer = cc; - *ret = cc; + *buffer = h; + *ret = TAKE_PTR(h); return 0; } @@ -135,18 +133,16 @@ static int from_user_dir(const char *field, char **buffer, const char **ret) { /* Three syntaxes permitted: relative to $HOME, $HOME itself, and absolute path */ if (startswith(p, "$HOME/")) { _cleanup_free_ char *h = NULL; - char *cc; r = get_home_dir(&h); if (r < 0) return r; - cc = path_join(h, p+5); - if (!cc) + if (!path_extend(&h, p+5)) return -ENOMEM; - *buffer = cc; - *ret = cc; + *buffer = h; + *ret = TAKE_PTR(h); return 0; } else if (streq(p, "$HOME")) { @@ -173,20 +169,17 @@ fallback: /* The desktop directory defaults to $HOME/Desktop, the others to $HOME */ if (streq(field, "XDG_DESKTOP_DIR")) { _cleanup_free_ char *h = NULL; - char *cc; r = get_home_dir(&h); if (r < 0) return r; - cc = path_join(h, "Desktop"); - if (!cc) + if (!path_extend(&h, "Desktop")) return -ENOMEM; - *buffer = cc; - *ret = cc; + *buffer = h; + *ret = TAKE_PTR(h); } else { - r = get_home_dir(buffer); if (r < 0) return r; |