From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Mar 2021 19:41:34 +0000 (+0100)
Subject: fs-util: port symlink_idempotent() to path_extract_directory()
X-Git-Tag: v248-rc3~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9813d8354cc9af33b739e8d478368adfb548edc1;p=thirdparty%2Fsystemd.git

fs-util: port symlink_idempotent() to path_extract_directory()
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index cc219d297bd..b2a4e8036f8 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -428,9 +428,9 @@ int symlink_idempotent(const char *from, const char *to, bool make_relative) {
         if (make_relative) {
                 _cleanup_free_ char *parent = NULL;
 
-                parent = dirname_malloc(to);
-                if (!parent)
-                        return -ENOMEM;
+                r = path_extract_directory(to, &parent);
+                if (r < 0)
+                        return r;
 
                 r = path_make_relative(parent, from, &relpath);
                 if (r < 0)