]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fs-util: port symlink_idempotent() to path_extract_directory()
authorLennart Poettering <lennart@poettering.net>
Mon, 8 Mar 2021 19:41:34 +0000 (20:41 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 9 Mar 2021 14:37:23 +0000 (14:37 +0000)
src/basic/fs-util.c

index cc219d297bdfcfcc48a39cdccd49653e309ed1c8..b2a4e8036f8d3653a7e69e61e769f5bfc36f5f35 100644 (file)
@@ -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)