diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-08 09:56:09 +0300 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-11 09:29:16 +0300 |
commit | 61fc64ed975d0c47582c23e5ce47a4af51c66733 (patch) | |
tree | 211bc7777f78d5ae87122005f02a5d8e70776aac /newlib/libc/posix | |
parent | d3d838cc2630c416aff8d0b0d0bc1e44a5cf81dc (diff) |
Open a directory with the usual flags
Use O_RDONLY since you are not supposed to write to a directory.
Use O_DIRECTORY as mandated by POSIX (The Open Group Base Specifications
Issue 7, 2018 edition IEEE Std 1003.1-2017):
"If the type DIR is implemented using a file descriptor, the descriptor
shall be obtained as if the O_DIRECTORY flag was passed to open()."
Use O_CLOEXEC as mandated by POSIX:
"When a file descriptor is used to implement the directory stream, it
behaves as if the FD_CLOEXEC had been set for the file descriptor."
Drop the fcntl() call in favour of O_CLOEXEC.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diffstat (limited to 'newlib/libc/posix')
-rw-r--r-- | newlib/libc/posix/opendir.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/newlib/libc/posix/opendir.c b/newlib/libc/posix/opendir.c index 1416f1053..650cbfe8d 100644 --- a/newlib/libc/posix/opendir.c +++ b/newlib/libc/posix/opendir.c @@ -49,17 +49,12 @@ static char sccsid[] = "@(#)opendir.c 5.11 (Berkeley) 2/23/91"; DIR * opendir (const char *name) { - register DIR *dirp; - register int fd; - int rc = 0; + DIR *dirp; + int fd; - if ((fd = open(name, 0)) == -1) + if ((fd = open(name, O_RDONLY | O_DIRECTORY | O_CLOEXEC)) == -1) return NULL; -#ifdef HAVE_FCNTL - rc = fcntl(fd, F_SETFD, 1); -#endif - if (rc == -1 || - (dirp = (DIR *)malloc(sizeof(DIR))) == NULL) { + if ((dirp = (DIR *)malloc(sizeof(DIR))) == NULL) { close (fd); return NULL; } |