From 4d207ba52cb963c2ebec17bfc4300d570aa43846 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 1 Dec 2016 12:49:23 +0100 Subject: [PATCH] =?utf8?q?util-lib:=20rename=20CHASE=5FNON=5FEXISTING=20?= =?utf8?q?=E2=86=92=20CHASE=5FNONEXISTENT?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As suggested by @keszybz --- src/basic/fs-util.c | 4 ++-- src/basic/fs-util.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index be4c6a9fa..4d494650c 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -716,10 +716,10 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, if (child < 0) { if (errno == ENOENT && - (flags & CHASE_NON_EXISTING) && + (flags & CHASE_NONEXISTENT) && (isempty(todo) || path_is_safe(todo))) { - /* If CHASE_NON_EXISTING is set, and the path does not exist, then that's OK, return + /* If CHASE_NONEXISTENT is set, and the path does not exist, then that's OK, return * what we got so far. But don't allow this if the remaining path contains "../ or "./" * or something else weird. */ diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index e206a382e..d925cc2d0 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -93,7 +93,7 @@ int inotify_add_watch_fd(int fd, int what, uint32_t mask); #endif // 0 enum { CHASE_PREFIX_ROOT = 1, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */ - CHASE_NON_EXISTING = 2, /* If set, it's OK if the path doesn't actually exist. */ + CHASE_NONEXISTENT = 2, /* If set, it's OK if the path doesn't actually exist. */ }; int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret); -- 2.30.2