From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Apr 2022 13:44:02 +0000 (+0200)
Subject: chase-symlinks: prefer path_extract_directory() over dirname()
X-Git-Tag: v251-rc2~134^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23061%2Fhead;p=thirdparty%2Fsystemd.git

chase-symlinks: prefer path_extract_directory() over dirname()
---

diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c
index 1fca871495a..e93419d6359 100644
--- a/src/basic/chase-symlinks.c
+++ b/src/basic/chase-symlinks.c
@@ -236,9 +236,9 @@ int chase_symlinks(
                         if (empty_or_root(done))
                                 continue;
 
-                        parent = dirname_malloc(done);
-                        if (!parent)
-                                return -ENOMEM;
+                        r = path_extract_directory(done, &parent);
+                        if (r < 0)
+                                return r;
 
                         /* Don't allow this to leave the root dir.  */
                         if (root &&