From 22a1292a42facff7597f3336a91eea57db9709e6 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sat, 25 Feb 1995 01:23:32 +0000
Subject: * io/Makefile (routines): Add euidaccess.

	* sysdeps/mach/hurd/euidaccess.c: New file.
	* sysdeps/stub/euidaccess.c: New file.
	* posix/unistd.h [__USE_GNU] (euidaccess): Declare it.

	* dirent/Makefile (routines): Add dirfd.
	* sysdeps/stub/dirfd.c: New file.
	* sysdeps/unix/dirfd.c: New file.
	* sysdeps/unix/dirstream.h (_DIR_dirfd): New macro.
	* dirent/dirent.h (dirfd): Declare new function.  Define as macro
 	_DIR_dirfd if that is defined.
	* sysdeps/mach/hurd/dirstream.h (DIR): Replace `__port' member
 	with `void *__fd'.
	* sysdeps/mach/hurd/opendir.c: Use DIRP->__fd instead of DIRP->__port.
	Open the file with `open'; set FD_CLOEXEC on the fd.
	* sysdeps/mach/hurd/closedir.c: Likewise.
	* sysdeps/mach/hurd/readdir.c: Likewise.
	* sysdeps/mach/hurd/dirfd.c: New file.

	* posix/Makefile (glob/configure): Do cvs commit if there is a CVS
 	directory.
	(glob/ChangeLog): Likewise.

	* locale/locale.h (LC_*): Use small integers instead of bit masks.
---
 sysdeps/mach/hurd/opendir.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'sysdeps/mach/hurd/opendir.c')

diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c
index d843da8aeb..001016d087 100644
--- a/sysdeps/mach/hurd/opendir.c
+++ b/sysdeps/mach/hurd/opendir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995 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
@@ -36,21 +36,29 @@ DEFUN(opendir, (name), CONST char *name)
 {
   DIR *dirp;
   file_t port;
+  int fd;
 
-  port = __file_name_lookup (name, O_RDONLY, 0);
-  if (port == MACH_PORT_NULL)
+  fd = __open (name, O_RDONLY);
+  if (fd < 0)
     return NULL;
 
-  /* XXX this port should be deallocated on exec */
-
   dirp = (DIR *) malloc (sizeof (DIR));
   if (dirp == NULL)
     {
-      __mach_port_deallocate (__mach_task_self (), port);
+      __close (fd);
       return NULL;
     }    
 
-  dirp->__port = port;
+  /* Extract the pointer to the descriptor structure.  */
+  __mutex_lock (&_hurd_dtable_lock);
+  dirp->__fd = _hurd_dtable[fd];
+  __mutex_unlock (&_hurd_dtable_lock);
+
+  /* Set the descriptor to close on exec. */
+  __spin_lock (&dirp->__fd->port.lock);
+  dirp->__fd->flags |= FD_CLOEXEC;
+  __spin_unlock (&dirp->__fd->port.lock);
+
   dirp->__data = dirp->__ptr = NULL;
   dirp->__entry_data = dirp->__entry_ptr = 0;
   dirp->__allocation = 0;
-- 
cgit 1.4.1