Skip to content

Commit

Permalink
* sysdeps/mach/hurd/opendir.c (__opendir): Likewise.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland McGrath committed Mar 5, 2006
1 parent 0b9b4d8 commit f96c3e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* sysdeps/mach/hurd/fdopendir.c (__fdopendir): Use O_DIRECTORY
to force directory check.
* sysdeps/mach/hurd/opendir.c (__opendir): Likewise.

2006-03-04 Roland McGrath <roland@frob.com>

Expand Down
28 changes: 3 additions & 25 deletions sysdeps/mach/hurd/opendir.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1993,94,95,96,97,98,2001,2003,2005
/* Copyright (C) 1993,1994,1995,1996,1997,1998,2001,2003,2005,2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Expand Down Expand Up @@ -71,9 +71,6 @@ _hurd_fd_opendir (struct hurd_fd *d)
DIR *
__opendir (const char *name)
{
int fd;
DIR *dirp;

if (name[0] == '\0')
{
/* POSIX.1-1990 says an empty name gets ENOENT;
Expand All @@ -82,31 +79,12 @@ __opendir (const char *name)
return NULL;
}

{
/* Append trailing slash to directory name to force ENOTDIR
if it's not a directory.
We open using the O_NONBLOCK flag so that a nondirectory with
blocking behavior (FIFO or device) gets ENOTDIR immediately
rather than waiting for the special file's open wakeup predicate. */

size_t len = strlen (name);
if (name[len - 1] == '/')
fd = __open (name, O_RDONLY | O_NONBLOCK);
else
{
char n[len + 2];
memcpy (n, name, len);
n[len] = '/';
n[len + 1] = '\0';
fd = __open (n, O_RDONLY | O_NONBLOCK);
}
}
int fd = __open (name, O_RDONLY | O_NONBLOCK | O_DIRECTORY);
if (fd < 0)
return NULL;

/* Extract the pointer to the descriptor structure. */
dirp = _hurd_fd_opendir (_hurd_fd_get (fd));
DIR *dirp = _hurd_fd_opendir (_hurd_fd_get (fd));
if (dirp == NULL)
__close (fd);

Expand Down

0 comments on commit f96c3e9

Please sign in to comment.