From f4bfb87ce5efc8d6e0794fffa453df6c55e0b7e7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 4 Feb 2006 02:19:23 +0000
Subject: use O_DIRECTORY when possible, saves us from having to use stat()
 thus cutting codesize/race condition

---
 libc/misc/dirent/opendir.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libc/misc/dirent')

diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index 6bd1da81d..5c78252b1 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/dir.h>
@@ -29,13 +30,17 @@ DIR *opendir(const char *name)
 	char *buf;
 	DIR *ptr;
 
+#ifndef O_DIRECTORY
+	/* O_DIRECTORY is linux specific and has been around since like 2.1.x */
 	if (stat(name, &statbuf))
 		return NULL;
 	if (!S_ISDIR(statbuf.st_mode)) {
 		__set_errno(ENOTDIR);
 		return NULL;
 	}
-	if ((fd = open(name, O_RDONLY)) < 0)
+# define O_DIRECTORY 0
+#endif
+	if ((fd = open(name, O_RDONLY|O_NDELAY|O_DIRECTORY)) < 0)
 		return NULL;
 	/* According to POSIX, directory streams should be closed when
 	 * exec. From "Anna Pluzhnikov" <besp@midway.uchicago.edu>.
-- 
cgit v1.2.3