diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-08-20 12:31:07 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-08-20 12:31:07 +0000 |
| commit | f1f69c58bfd6987f45ea29ceef0b2cea850fb5b1 (patch) | |
| tree | 0719e36cfe2095b3f6a61d719b233b756522a088 | |
| parent | b0662a051b9abb69de90a0762d518ff85842aad8 (diff) | |
| download | cygnal-f1f69c58bfd6987f45ea29ceef0b2cea850fb5b1.tar.gz cygnal-f1f69c58bfd6987f45ea29ceef0b2cea850fb5b1.tar.bz2 cygnal-f1f69c58bfd6987f45ea29ceef0b2cea850fb5b1.zip | |
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Fix formatting.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index dfeaff42d..11dc7f734 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 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> + * fhandler_disk_file.cc (DIR_NUM_ENTRIES): Set to 100 to maximize performance on remote shares. (fhandler_disk_file::opendir): Move comment about Samba weirdness into diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index a78d98d49..d330a750f 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1583,7 +1583,9 @@ fhandler_disk_file::opendir () dir->__handle = INVALID_HANDLE_VALUE; 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); if (wincap.is_winnt ()) { @@ -1597,13 +1599,14 @@ fhandler_disk_file::opendir () NTSTATUS status; SECURITY_ATTRIBUTES sa = sec_none; 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); - status = NtOpenFile (&dir->__handle, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, wincap.shared (), - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + FILE_SYNCHRONOUS_IO_NONALERT + | FILE_DIRECTORY_FILE); if (!NT_SUCCESS (status)) { __seterrno_from_nt_status (status); |