From ce8394f9c7d2a71f7bb3009594e625982b605bbb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Apr 2022 13:33:43 +0900 Subject: [PATCH] fs-util: use path_extract_filename() at one more place --- src/basic/fs-util.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index d67b30429c..96b588a4b5 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -156,24 +156,16 @@ int readlink_malloc(const char *p, char **ret) { int readlink_value(const char *p, char **ret) { _cleanup_free_ char *link = NULL; - char *value; int r; + assert(p); + assert(ret); + r = readlink_malloc(p, &link); if (r < 0) return r; - value = basename(link); - if (!value) - return -ENOENT; - - value = strdup(value); - if (!value) - return -ENOMEM; - - *ret = value; - - return 0; + return path_extract_filename(link, ret); } int readlink_and_make_absolute(const char *p, char **r) { -- 2.25.1