From 99e46354d96d9dc70c7b5ae7ed1a3d7ff0dbb77f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 13 Oct 1998 15:12:27 +0000 Subject: Update. 1998-10-13 Ulrich Drepper * sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c: Include string.h to get memcpy prototype and NULL definition. 1998-10-12 Andreas Schwab * misc/sys/cdefs.h (__THROW): New macro. * argp/argp.h: Use it to replace the kludgey __P in inline function definitions. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * stdlib/stdlib.h: Likewise. * wcsmbs/wchar.h: Likewise. * libio/stdio.h: Likewise. * stdio/stdio.h: Likewise. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/wordsize-32/inttypes.h: Likewise. * string/argz.h: Likewise. * io/sys/stat.h: Likewise. 1998-10-12 Andreas Schwab * Rules (stdio_lim): New variable. ($(stdio_lim:h=st)): Use this as intermediate stamp file, depend on Rules and config.make, use $(move-if-change) to avoid unnessary recompilations, and cleanup command. (common-generated): Add bits/stdio_lim.st. --- sysdeps/unix/opendir.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/opendir.c') diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index ef7bc84866..4df06ed7b8 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -47,6 +47,17 @@ __opendir (const char *name) return NULL; } + /* 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) + return NULL; + if (! S_ISDIR (statbuf.st_mode)) + { + __set_errno (ENOTDIR); + return NULL; + } + fd = __open (name, O_RDONLY|O_NDELAY); if (fd < 0) return NULL; @@ -54,14 +65,6 @@ __opendir (const char *name) if (__fcntl (fd, F_SETFD, FD_CLOEXEC) < 0) goto lose; - if (fstat (fd, &statbuf) < 0) - goto lose; - if (! S_ISDIR (statbuf.st_mode)) - { - save_errno = ENOTDIR; - goto lose2; - } - #ifdef _STATBUF_ST_BLKSIZE if (statbuf.st_blksize < sizeof (struct dirent)) allocation = sizeof (struct dirent); -- cgit v1.2.3