From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 18 Jul 2019 11:18:36 +0000 (+0200)
Subject: fs-util: CHASE_NOFOLLOW is not limited to CHASE_OPEN
X-Git-Tag: v243-rc1~29^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13194%2Fhead;p=thirdparty%2Fsystemd.git

fs-util: CHASE_NOFOLLOW is not limited to CHASE_OPEN

$ build/test-chase-symlinks /etc/os-release
/etc/os-release → /usr/lib/os-release

$ build/test-chase-symlinks --nofollow /etc/os-release /etc/../etc/os-release /etc/../etc/./././os-release
/etc/os-release → /etc/os-release
/etc/../etc/os-release → /etc/os-release
/etc/../etc/./././os-release → /etc/os-release
---

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index a35c3b6f311..9a242ce3c5b 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -81,8 +81,9 @@ enum {
         CHASE_OPEN        = 1 << 4, /* Return an O_PATH object to the final component */
         CHASE_TRAIL_SLASH = 1 << 5, /* Any trailing slash will be preserved */
         CHASE_STEP        = 1 << 6, /* Just execute a single step of the normalization */
-        CHASE_NOFOLLOW    = 1 << 7, /* Only valid with CHASE_OPEN: when the path's right-most component refers to symlink,
-                                     * return O_PATH fd of the symlink, rather than following it. */
+        CHASE_NOFOLLOW    = 1 << 7, /* Do not follow the path's right-most compontent. With CHASE_OPEN, when
+                                     * the path's right-most component refers to symlink, return O_PATH fd of
+                                     * the symlink. */
         CHASE_WARN        = 1 << 8, /* Emit an appropriate warning when an error is encountered */
 };