From acd7f7ed437793e7c67ecd869cfac32a87c1ec52 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sat, 12 Aug 2017 18:12:13 -0400 Subject: Unify broken symlink handling Rather than open-code the fallback logic for broken symlinks everywhere it's needed, introduce a new xfstatat() utility function that performs the fallback automatically. Using xfstatat() consistently fixes a few bugs, including cases where broken symlinks are given as arguments to predicates like -samefile. --- util.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'util.c') diff --git a/util.c b/util.c index 2e6b477..d825554 100644 --- a/util.c +++ b/util.c @@ -226,6 +226,17 @@ const char *xbasename(const char *path) { return i; } +int xfstatat(int fd, const char *path, struct stat *buf, int *flags) { + int ret = fstatat(fd, path, buf, *flags); + + if (ret != 0 && !(*flags & AT_SYMLINK_NOFOLLOW) && (errno == ENOENT || errno == ENOTDIR)) { + *flags |= AT_SYMLINK_NOFOLLOW; + ret = fstatat(fd, path, buf, *flags); + } + + return ret; +} + enum bftw_typeflag mode_to_typeflag(mode_t mode) { switch (mode & S_IFMT) { #ifdef S_IFBLK -- cgit v1.2.3