diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-12-01 12:49:23 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 17:58:35 +0200 |
| commit | 4d207ba52cb963c2ebec17bfc4300d570aa43846 (patch) | |
| tree | ea835185344ce996c5fb517228a751eb8644d476 /src/basic | |
| parent | aa63b97173e12293234cce3b378912eb761778e1 (diff) | |
util-lib: rename CHASE_NON_EXISTING → CHASE_NONEXISTENT
As suggested by @keszybz
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/fs-util.c | 4 | ||||
| -rw-r--r-- | 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); |