system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update.

Browse Source 
1998-10-19  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/opendir.c (__opendir): Add back fstat call to make
	sure that descriptor is in any case for a directory.
This commit is contained in:
Ulrich Drepper 1998-10-19 16:30:28 +00:00
parent cfb32a6c81
commit 4bd8be48e9
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1998-10-19 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/opendir.c (__opendir): Add back fstat call to make
sure that descriptor is in any case for a directory.
1998-10-19 18:59 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* math/tgmath.h (__TGMATH_UNARY_REAL_IMAG): Fix typo: val -> Val.

38
sysdeps/unix/opendir.c
View File

@ -30,26 +30,8 @@
#include <dirstream.h>
/* We want to be really safe the file we opened is a directory. Some systems
have support for this, others don't. */
#ifdef O_DIRECTORY
# define OPENDIR(NAME) \
do { \
fd = __open (NAME, O_RDONLY|O_NDELAY|O_DIRECTORY); \
if (fd < 0) \
return NULL; \
} while (0)
#else
# define OPENDIR(NAME) \
do { \
fd = __open (NAME, O_RDONLY|O_NDELAY); \
if (fd < 0 || __fstat (fd, &statbuf) < 0 || ! S_ISDIR (statbuf.st_mode)) \
{ \
if (fd >= 0) \
__close (fd); \
return NULL; \
} \
} while (0)
#ifndef O_DIRECTORY
# define O_DIRECTORY 0
#endif
@ -74,7 +56,7 @@ __opendir (const char *name)
/* We first have to check whether the name is for a directory. We
cannot do this after the open() call since the open/close operation
performed on, say, a tape device might have undesirable effects. */
if (stat (name, &statbuf) < 0)
if (__stat (name, &statbuf) < 0)
return NULL;
if (! S_ISDIR (statbuf.st_mode))
{
@ -82,7 +64,19 @@ __opendir (const char *name)
return NULL;
}
OPENDIR (name);
fd = __open (name, O_RDONLY|O_NDELAY|O_DIRECTORY);
if (fd < 0)
return NULL;
/* Now make sure this really is a directory and nothing changed since
the `stat' call. */
if (__fstat (fd, &statbuf) < 0)
goto lose;
if (! S_ISDIR (statbuf.st_mode))
{
save_errno = ENOTDIR;
goto lose;
}
if (__fcntl (fd, F_SETFD, FD_CLOEXEC) < 0)
goto lose;