From 281bd334ac254ee5b9c875f55980444069489395 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 9 Jul 2007 17:02:37 +0000 Subject: * dir.cc (closedir): Revert change from 2007-06-29. * fhandler.h (dirent_valid_fd): Drop. * fhandler_disk_file.cc (fhandler_disk_file::opendir): If opening a real dir, use the underlying fhandler to keep track of the directory handle. In fdopendir case use original io_handle from fhandler. Use fhandler's io_handle in subsequent directory functions throughout. Create handle non-inheritable and set close-on-exec flag. (readdir_get_ino): Drop dirent_isroot case. (fhandler_disk_file::readdir): Handle dirent_isroot case here. (fhandler_disk_file::rewinddir): Revert change from 2007-07-05. Use NtClose instead of CloseHandle. * fhandler_virtual.cc (fhandler_virtual::opendir): Drop adding dirent_valid_fd flag. Set close-on-exec flag. --- winsup/cygwin/fhandler_virtual.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'winsup/cygwin/fhandler_virtual.cc') diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc index f5a9f7eeb..4db2cf726 100644 --- a/winsup/cygwin/fhandler_virtual.cc +++ b/winsup/cygwin/fhandler_virtual.cc @@ -80,7 +80,6 @@ fhandler_virtual::opendir (int fd) if (fd >= 0) { - dir->__flags |= dirent_valid_fd; dir->__d_fd = fd; res = dir; dir->__fh = this; @@ -98,6 +97,7 @@ fhandler_virtual::opendir (int fd) res = dir; } } + close_on_exec (true); } syscall_printf ("%p = opendir (%s)", res, get_name ()); -- cgit v1.2.3