From 53612664740f3a31d93d2059f7d981da3ba565dc Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sat, 29 Jul 2017 18:23:01 -0400 Subject: util: Define O_DIRECTORY to 0 if it's not already defined --- eval.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 16105fe..6883ce4 100644 --- a/eval.c +++ b/eval.c @@ -334,11 +334,7 @@ bool eval_empty(const struct expr *expr, struct eval_state *state) { struct BFTW *ftwbuf = state->ftwbuf; if (ftwbuf->typeflag == BFTW_DIR) { - int flags = O_RDONLY | O_CLOEXEC; -#ifdef O_DIRECTORY - flags |= O_DIRECTORY; -#endif - int dfd = openat(ftwbuf->at_fd, ftwbuf->at_path, flags); + int dfd = openat(ftwbuf->at_fd, ftwbuf->at_path, O_RDONLY | O_CLOEXEC | O_DIRECTORY); if (dfd < 0) { eval_error(state); goto done; -- cgit v1.2.3