* 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.
This commit is contained in:
@@ -52,10 +52,9 @@ enum dirent_states
|
||||
dirent_isroot = 0x0008,
|
||||
dirent_set_d_ino = 0x0010,
|
||||
dirent_get_d_ino = 0x0020,
|
||||
dirent_valid_fd = 0x0040,
|
||||
|
||||
/* Global flags which must not be deleted on rewinddir or seekdir. */
|
||||
dirent_info_mask = 0x0078
|
||||
dirent_info_mask = 0x0038
|
||||
};
|
||||
|
||||
enum conn_state
|
||||
|
Reference in New Issue
Block a user