diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-07-19 11:41:17 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-07-19 11:41:17 +0000 |
| commit | 91d2f6eebffcc8aa492b59c99f429aa41d09e82e (patch) | |
| tree | 352a204a595b1dfca2717b022b8fafe721969a36 /winsup/cygwin/fhandler_disk_file.cc | |
| parent | b0ff8192adfe713fbaefa27adbd8dee4014f00f7 (diff) | |
| download | cygnal-91d2f6eebffcc8aa492b59c99f429aa41d09e82e.tar.gz cygnal-91d2f6eebffcc8aa492b59c99f429aa41d09e82e.tar.bz2 cygnal-91d2f6eebffcc8aa492b59c99f429aa41d09e82e.zip | |
* fhandler.cc (fhandler_base::open): Drop local wpath and upath
variables. Call pc.get_object_attr to create object attributes.
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Ditto.
* syscalls.cc (unlink_nt): Ditto.
* path.cc (path_conv::set_normalized_path): Set wide_path to NULL.
(path_conv::get_nt_native_path): Drop parameter. Create path in
wide_path/uni_path members.
(path_conv::get_object_attr): New method to create object attributes.
(path_conv::get_wide_win32_path): New method to create Win32 wide path.
(path_conv::check): Initialize wide_path to NULL.
(path_conv::~path_conv): cfree wide_path.
* path.h (class path_conv): New members wide_path and uni_path.
Add declarations of get_object_attr and get_wide_win32_path.
(path_conv::path_conv): Initialize wide_path to NULL.
(path_conv::get_nt_native_path): Drop parameter.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 17c93be9a..a2b2bf093 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1575,16 +1575,11 @@ fhandler_disk_file::opendir (int fd) OBJECT_ATTRIBUTES attr; NTSTATUS status; IO_STATUS_BLOCK io; - WCHAR wpath[CYG_MAX_PATH + 10] = { 0 }; - UNICODE_STRING upath = {0, sizeof (wpath), wpath}; - SECURITY_ATTRIBUTES sa = sec_none; - pc.get_nt_native_path (upath); - InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE, - NULL, sa.lpSecurityDescriptor); status = NtOpenFile (&get_handle (), SYNCHRONIZE | FILE_LIST_DIRECTORY, - &attr, &io, FILE_SHARE_VALID_FLAGS, + pc.get_object_attr (attr, sec_none_nih), + &io, FILE_SHARE_VALID_FLAGS, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); |