diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-06-04 01:33:29 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-06-04 01:33:29 +0400 |
| commit | 163328965683ec08acab9c2247b8efcb81ec8eb0 (patch) | |
| tree | d5d38b24d5aa77659436bc86b19ec3d7701fb2db | |
| parent | 604ca5fa1726b9d42527e0e0e4b767858a646c67 (diff) | |
revert accidental checkin
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index c90acb24d..c481bde29 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -531,9 +531,7 @@ done: int fhandler_base::open (int flags, mode_t mode) { - UNICODE_STRING upath; - WCHAR wpath[CYG_MAX_PATH + 10]; - if (!wincap.is_winnt () || RtlIsDosDeviceName_U(wpath)) + if (!wincap.is_winnt ()) return fhandler_base::open_9x (flags, mode); int res = 0; @@ -544,6 +542,8 @@ fhandler_base::open (int flags, mode_t mode) ULONG create_options; SECURITY_ATTRIBUTES sa = sec_none; security_descriptor sd; + UNICODE_STRING upath; + WCHAR wpath[CYG_MAX_PATH + 10]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; @@ -555,7 +555,8 @@ fhandler_base::open (int flags, mode_t mode) goto done; } - InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + InitializeObjectAttributes (&attr, pc.get_nt_native_path (upath, wpath), + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, sa.lpSecurityDescriptor, NULL); switch (query_open ()) |