* sysdeps/mach/hurd/opendir.c (_hurd_fd_opendir): New function, broken

	out of ...
	(__opendir): ... here.  Call it.
	* sysdeps/mach/hurd/fdopendir.c: New file.

3 files changed, 103 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 958b79e..703eead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-14  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/hurd/opendir.c (_hurd_fd_opendir): New function, broken
+	out of ...
+	(__opendir): ... here.  Call it.
+	* sysdeps/mach/hurd/fdopendir.c: New file.
+
 2005-10-14  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #865]
diff --git a/sysdeps/mach/hurd/fdopendir.c b/sysdeps/mach/hurd/fdopendir.c
new file mode 100644
index 0000000..d08e478
--- /dev/null
+++ b/sysdeps/mach/hurd/fdopendir.c
@@ -0,0 +1,55 @@
+/* Open a directory stream from a file descriptor.  Hurd version.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <dirent.h>
+#include <errno.h>
+#include <hurd.h>
+#include <hurd/fd.h>
+
+DIR *_hurd_fd_opendir (struct hurd_fd *d); /* opendir.c */
+
+/* Open a directory stream on FD.  */
+DIR *
+fdopendir (int fd)
+{
+  struct hurd_fd *d = _hurd_fd_get (d);
+
+  if (d == NULL)
+    {
+      errno = EBADF;
+      return NULL;
+    }
+
+  /* Ensure that it's a directory.  */
+  error_t err = HURD_FD_PORT_USE
+    (d, ({
+	file_t dir = __file_name_lookup_under (port, "/", O_NOTRANS, 0);
+	if (dir != MACH_PORT_NULL)
+	  __mach_port_deallocate (__mach_task_self (), dir);
+	dir != MACH_PORT_NULL ? 0 : errno;
+      }));
+
+  if (err)
+    {
+      errno = err;
+      return NULL;
+    }
+
+  return _hurd_fd_opendir (d);
+}
diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c
index a1ff947..949db0f 100644
--- a/sysdeps/mach/hurd/opendir.c
+++ b/sysdeps/mach/hurd/opendir.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1993,94,95,96,97,98,2001,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,96,97,98,2001,2003,2005
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -32,13 +33,46 @@
 #include "dirstream.h"
 
 
+/* Open a directory stream on a file descriptor in Hurd internal form.
+   We do no checking here on the descriptor.  */
+DIR *
+_hurd_fd_opendir (struct hurd_fd *d)
+{
+  DIR *dirp;
+
+  if (d == NULL)
+    {
+      errno = EBADF;
+      return NULL;
+    }
+
+  dirp = (DIR *) malloc (sizeof (DIR));
+  if (dirp == NULL)
+    return NULL;
+
+  /* Set the descriptor to close on exec. */
+  __spin_lock (&d->port.lock);
+  d->flags |= FD_CLOEXEC;
+  __spin_unlock (&d->port.lock);
+
+  dirp->__fd = d;
+  dirp->__data = dirp->__ptr = NULL;
+  dirp->__entry_data = dirp->__entry_ptr = 0;
+  dirp->__allocation = 0;
+  dirp->__size = 0;
+
+  __libc_lock_init (dirp->__lock);
+
+  return dirp;
+}
+
+
 /* Open a directory stream on NAME.  */
 DIR *
 __opendir (const char *name)
 {
-  DIR *dirp;
   int fd;
-  struct hurd_fd *d;
+  DIR *dirp;
 
   if (name[0] == '\0')
     {
@@ -71,29 +105,12 @@ __opendir (const char *name)
   if (fd < 0)
     return NULL;
 
-  dirp = (DIR *) malloc (sizeof (DIR));
-  if (dirp == NULL)
-    {
-      __close (fd);
-      return NULL;
-    }
-
   /* Extract the pointer to the descriptor structure.  */
-  __mutex_lock (&_hurd_dtable_lock);
-  d = dirp->__fd = _hurd_dtable[fd];
-  __mutex_unlock (&_hurd_dtable_lock);
-
-  /* Set the descriptor to close on exec. */
-  __spin_lock (&d->port.lock);
-  d->flags |= FD_CLOEXEC;
-  __spin_unlock (&d->port.lock);
-
-  dirp->__data = dirp->__ptr = NULL;
-  dirp->__entry_data = dirp->__entry_ptr = 0;
-  dirp->__allocation = 0;
-  dirp->__size = 0;
+  dirp = _hurd_fd_opendir (_hurd_fd_get (fd));
+  if (dirp == NULL)
+    __close (fd);
 
-  __libc_lock_init (dirp->__lock);
+    }
 
   return dirp;
 }