From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Nov 2021 21:18:31 +0000 (+0100)
Subject: recurse-dir: give callers of recurse_dir_at() control over path prefix
X-Git-Tag: v250-rc1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa3cc58a9f988fb8086c8f38cd25a95819a2c846;p=thirdparty%2Fsystemd.git

recurse-dir: give callers of recurse_dir_at() control over path prefix

One of the niceties of recurse_dir()/recurse_dir_at() is that the path
argument is decoration, it's not used for actually accessing the fs in
anyway. That's very handy in environments where chroots and relative
paths are used, as we can path in any path we like and the recursion
function will suffix with whatever it discovers but will not try to make
sense of the prefix you pass.

This works great, except that the recurse_dir_at() wrapper broke that:
it adjusted the path if NULL to "." simply for the sake of making
openat() on the top work. Let's make this adjustment more local and do
it only for the openat() itself, and otherwise pass the path through the
way we got it. This means: if a caller really wants the paths that are
concatenated to start with a "." it can just pass that. This way the
caller gets full control back of the path prefix. Win!

Note that all current users of recurse_dir_at() don't pass NULL as
second arg, hence this check is without any real effect for now. It's
preparation for future uses however.
---

diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
index d1fee91c329..efa1797b7ba 100644
--- a/src/basic/recurse-dir.c
+++ b/src/basic/recurse-dir.c
@@ -444,10 +444,7 @@ int recurse_dir_at(
         assert(atfd >= 0 || atfd == AT_FDCWD);
         assert(func);
 
-        if (!path)
-                path = ".";
-
-        fd = openat(atfd, path, O_DIRECTORY|O_CLOEXEC);
+        fd = openat(atfd, path ?: ".", O_DIRECTORY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;