From 22f62b1274ba120ebc0d7de95bf3241982ddb840 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 18 Jul 2019 13:18:36 +0200 Subject: [PATCH] fs-util: CHASE_NOFOLLOW is not limited to CHASE_OPEN MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit $ 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 --- src/basic/fs-util.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 */ }; -- 2.47.3