diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-08 08:04:19 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-08 08:04:19 +0400 |
| commit | 0c7b55727aff6848f72afc41c149d9d4dfc3cdb5 (patch) | |
| tree | 216af49bea40c5c2e936020955135ce8a3529277 /winsup/cygwin/fhandler_virtual.cc | |
| parent | d31c5928ddc2f5cde08e89e55fb0cbc9656fd2b9 (diff) | |
Throughout, remove __d_u.__d_data fields from DIR structure.
* include/sys/dirent.h (dirent): Remvoe old_d_ino.
(DIR): Make __d_dirhash a 64 bit value. Remove __d_data and __d_u. Add
__flags.
* dir.cc (opendir_states): New enum.
(opendir): Clear new DIR __flags field.
(readdir): Fill in '.' and '..' entries if we hit EOF and we haven't seen them
already. Nuke setting of old_d_ino.
(rewinddir): Reset DIR __flags field.
(seekdir64): Ditto.
* fhandler_disk_file.cc (fhandler_cygdrive::fhandler_cygdrive): Remove special
handling of "." and ".." since they are now handled automatically.
Diffstat (limited to 'winsup/cygwin/fhandler_virtual.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_virtual.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc index 2c149566d..c3a355397 100644 --- a/winsup/cygwin/fhandler_virtual.cc +++ b/winsup/cygwin/fhandler_virtual.cc @@ -77,9 +77,9 @@ fhandler_virtual::opendir (path_conv& pc) fd = this; fd->set_nohandle (true); dir->__d_dirent->d_fd = fd; - dir->__d_u.__d_data.__fh = this; + dir->__fh = this; dir->__d_cookie = __DIRENT_COOKIE; - dir->__d_u.__d_data.__handle = INVALID_HANDLE_VALUE; + dir->__handle = INVALID_HANDLE_VALUE; dir->__d_position = 0; dir->__d_dirhash = get_namehash (); |