diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-10-23 15:13:55 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-10-23 15:13:55 +0000 |
| commit | 7a229db6544c207fda7a3cf535da96dda6954f8e (patch) | |
| tree | b3d9bcd0c8749fce844324809e2a185ed733c6eb /winsup/cygwin/fhandler_disk_file.cc | |
| parent | fc545fe9333fc89c691bf45b938e50f511365829 (diff) | |
| download | cygnal-7a229db6544c207fda7a3cf535da96dda6954f8e.tar.gz cygnal-7a229db6544c207fda7a3cf535da96dda6954f8e.tar.bz2 cygnal-7a229db6544c207fda7a3cf535da96dda6954f8e.zip | |
* fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Accomodate
buggy RestartScan behaviour of Windows 2000.
* wincap.h: Define has_buggy_restart_scan throughout.
* wincap.cc: Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 26a97f602..ed67bc78e 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1975,7 +1975,38 @@ void fhandler_disk_file::rewinddir (DIR *dir) { if (wincap.is_winnt ()) - d_cachepos (dir) = 0; + { + d_cachepos (dir) = 0; + if (wincap.has_buggy_restart_scan () && isremote ()) + { + /* This works around a W2K bug. The RestartScan parameter in calls + to NtQueryDiretoryFile on remote shares is ignored, thus resulting + in not being able to rewind on remote shares. By reopening the + directory, we get a fresh new directory pointers. w*/ + UNICODE_STRING fname = {0, CYG_MAX_PATH * 2, (WCHAR *) L""}; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + IO_STATUS_BLOCK io; + HANDLE new_dir; + + InitializeObjectAttributes (&attr, &fname, OBJ_CASE_INSENSITIVE, + dir->__handle, NULL); + status = NtOpenFile (&new_dir, SYNCHRONIZE | FILE_LIST_DIRECTORY, + &attr, &io, wincap.shared (), + FILE_SYNCHRONOUS_IO_NONALERT + | FILE_OPEN_FOR_BACKUP_INTENT + | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS (stat)) + debug_printf ("Unable to reopen dir %s, NT error: 0x%08x, " + "win32: %lu", get_name (), status, + RtlNtStatusToDosError (status)); + else + { + CloseHandle (dir->__handle); + dir->__handle = new_dir; + } + } + } else if (dir->__handle != INVALID_HANDLE_VALUE) { if (dir->__handle) |