From ecc7b3249050c17e089d6a812472d2923d572bcc Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 20 Sep 2017 18:46:55 -0400 Subject: util: Wrap faccessat() to fix some portability issues --- util.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'util.c') diff --git a/util.c b/util.c index bdb3620..0e7ec60 100644 --- a/util.c +++ b/util.c @@ -226,6 +226,20 @@ const char *xbasename(const char *path) { return i; } +int xfaccessat(int fd, const char *path, int amode) { + int ret = faccessat(fd, path, amode, 0); + +#ifdef AT_EACCESS + // Some platforms, like Hurd, only support AT_EACCESS. Other platforms, + // like Android, don't support AT_EACCESS at all. + if (ret != 0 && (errno == EINVAL || errno == ENOTSUP)) { + ret = faccessat(fd, path, amode, AT_EACCESS); + } +#endif + + return ret; +} + bool is_nonexistence_error(int error) { return error == ENOENT || errno == ENOTDIR; } -- cgit v1.2.3