JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_disk_file.cc (fhandler_disk_file::opendir): Fix formatting.

Browse Source
This commit is contained in:
Corinna Vinschen
2006-08-20 12:31:07 +00:00
parent b0662a051b
commit f1f69c58bf
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,7 @@
2006-08-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Fix formatting.
2006-08-20 Corinna Vinschen <corinna@vinschen.de> 2006-08-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (DIR_NUM_ENTRIES): Set to 100 to maximize * fhandler_disk_file.cc (DIR_NUM_ENTRIES): Set to 100 to maximize

11
winsup/cygwin/fhandler_disk_file.cc
View File

@@ -1583,7 +1583,9 @@ fhandler_disk_file::opendir ()
dir->__handle = INVALID_HANDLE_VALUE; dir->__handle = INVALID_HANDLE_VALUE;
dir->__d_position = 0; dir->__d_position = 0;
dir->__flags = (pc.normalized_path[0] == '/' && pc.normalized_path[1] == '\0') ? dirent_isroot : 0; dir->__flags = (pc.normalized_path[0] == '/'
&& pc.normalized_path[1] == '\0')
? dirent_isroot : 0;
dir->__d_internal = (unsigned) new __DIR_mounts (pc.normalized_path); dir->__d_internal = (unsigned) new __DIR_mounts (pc.normalized_path);
if (wincap.is_winnt ()) if (wincap.is_winnt ())
{ {
@@ -1597,13 +1599,14 @@ fhandler_disk_file::opendir ()
NTSTATUS status; NTSTATUS status;
SECURITY_ATTRIBUTES sa = sec_none; SECURITY_ATTRIBUTES sa = sec_none;
pc.get_nt_native_path (upath); pc.get_nt_native_path (upath);
InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE | OBJ_INHERIT, InitializeObjectAttributes (&attr, &upath,
OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
NULL, sa.lpSecurityDescriptor); NULL, sa.lpSecurityDescriptor);
status = NtOpenFile (&dir->__handle, status = NtOpenFile (&dir->__handle,
SYNCHRONIZE | FILE_LIST_DIRECTORY, SYNCHRONIZE | FILE_LIST_DIRECTORY,
&attr, &io, wincap.shared (), &attr, &io, wincap.shared (),
FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); FILE_SYNCHRONOUS_IO_NONALERT
| FILE_DIRECTORY_FILE);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
__seterrno_from_nt_status (status); __seterrno_from_nt_status (status);