* autoload.cc (NtQueryDirectoryFile): Define.
* dir.cc (__opendir_with_d_ino): Just call opendir. (opendir): Remove CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO handling. (readdir_worker): Only try generating d_ino if it's 0. Utilize namehash of directories fhandler. Call readdir_get_ino to generate d_ino for "..". (seekdir64): Keep dirent_set_d_ino flag. * fhandler.h (enum dirent_states): Add dirent_get_d_ino. (class fhandler_disk_file): Declare new private methods readdir_helper and readdir_9x. * fhandler_disk_file.cc (path_conv::hasgood_inode): New method to evaluate if a filesystem has reliable inode numbers. (fhandler_base::fstat_by_handle): Accomodate structure member name change from IndexNumber to FileId. (fhandler_base::fstat_helper): Call hasgood_inode here. (fhandler_disk_file::opendir): Call fhaccess only for real files. Don't append '*' to __d_dirname here, move to readdir_9x. On NT, open directory handle here. Set dirent_get_d_ino and dirent_set_d_ino flags according to wincap and filesystem. (fhandler_disk_file::readdir_helper): New method to implement readdir postprocessing only once. (readdir_get_ino_by_handle): New static function. (readdir_get_ino): New function to centralize inode number evaluation in case inode number hasn't been returned by NtQueryDirectoryFile. (fhandler_disk_file::readdir): Move old functionality to readdir_9x. Call readdir_9x when on 9x/Me. Implement NT specific readdir here. (fhandler_disk_file::readdir_9x): Move 9x specific readdir here. (fhandler_disk_file::seekdir): Accomodate new NT readdir method. (fhandler_disk_file::closedir): Ditto. (fhandler_cygdrive::fstat): Set d_ino to namehash. Add comment. (fhandler_cygdrive::opendir): Call get_namehash to prepare later correct evaluation of d_ino. (fhandler_cygdrive::readdir): Replace recursion with loop. Evaluate drive's d_ino by calling readdir_get_ino. * fhandler_proc.cc (fhandler_proc::readdir): Set dirent_saw_dot and dirent_saw_dot_dot to avoid seeing . and .. entries twice. * fhandler_process.cc (fhandler_process::readdir): Ditto. * fhandler_registry.cc (fhandler_registry::readdir): Ditto. * ntdll.h (STATUS_INVALID_PARAMETER): New define. (STATUS_INVALID_LEVEL): New define. (struct _FILE_INTERNAL_INFORMATION): Rename member IndexNumber to FileId (as in Nebbitt). * path.h (path_conv::hasgood_inode): Now implemented in fhandler_disk_file.cc. * wincap.h (wincaps::has_fileid_dirinfo): New element. * wincap.cc: Implement above element throughout. * winsup.h (readdir_get_ino): Add declaration. * include/sys/dirent.h (struct dirent): Slightly rename structure members to accomodate changes. Remove __USE_EXPENSIVE_CYGWIN_D_INO handling and declaration of __opendir_with_d_ino.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* Posix dirent.h for WIN32.
|
||||
|
||||
Copyright 2001, 2002, 2003, 2005 Red Hat, Inc.
|
||||
Copyright 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
|
||||
|
||||
This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
@@ -20,9 +20,9 @@
|
||||
struct dirent
|
||||
{
|
||||
long __d_version; /* Used internally */
|
||||
__ino64_t __dirent_internal;
|
||||
__uint32_t __dirent_unused1;
|
||||
__uint32_t __dirent_internal1;
|
||||
__ino64_t d_ino;
|
||||
__uint32_t __d_fd;
|
||||
__uint32_t __d_internal1;
|
||||
char d_name[256]; /* FIXME: use NAME_MAX? */
|
||||
};
|
||||
#else
|
||||
@@ -31,7 +31,7 @@ struct dirent
|
||||
long d_version;
|
||||
long d_reserved[2];
|
||||
long d_fd;
|
||||
ino_t __invalid_d_ino; /* DO NOT USE: No longer available since cygwin 1.5.19 */
|
||||
ino_t d_ino;
|
||||
char d_name[256];
|
||||
};
|
||||
#endif
|
||||
@@ -55,14 +55,7 @@ typedef struct __DIR
|
||||
} DIR;
|
||||
#pragma pack(pop)
|
||||
|
||||
#ifndef __USE_EXPENSIVE_CYGWIN_D_INO
|
||||
DIR *opendir (const char *);
|
||||
#else
|
||||
#define d_ino __dirent_internal
|
||||
DIR *__opendir_with_d_ino (const char *);
|
||||
#define opendir __opendir_with_d_ino
|
||||
#endif
|
||||
|
||||
struct dirent *readdir (DIR *);
|
||||
int readdir_r (DIR *, struct dirent *, struct dirent **);
|
||||
void rewinddir (DIR *);
|
||||
|
Reference in New Issue
Block a user