diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-06-03 21:29:43 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-06-03 21:29:43 +0000 |
| commit | 604ca5fa1726b9d42527e0e0e4b767858a646c67 (patch) | |
| tree | dedd370fa2dd713d16788f17674b388389d8aac0 /winsup/cygwin/fhandler.cc | |
| parent | ee94df3eccde219778b98223d001ed244b3d3891 (diff) | |
| download | cygnal-604ca5fa1726b9d42527e0e0e4b767858a646c67.tar.gz cygnal-604ca5fa1726b9d42527e0e0e4b767858a646c67.tar.bz2 cygnal-604ca5fa1726b9d42527e0e0e4b767858a646c67.zip | |
* winbase.h (ilockincr): More changes from the inexplicable world of gcc asm
magic.
(ilockdecr): Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index c481bde29..c90acb24d 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -531,7 +531,9 @@ done: int fhandler_base::open (int flags, mode_t mode) { - if (!wincap.is_winnt ()) + UNICODE_STRING upath; + WCHAR wpath[CYG_MAX_PATH + 10]; + if (!wincap.is_winnt () || RtlIsDosDeviceName_U(wpath)) return fhandler_base::open_9x (flags, mode); int res = 0; @@ -542,8 +544,6 @@ 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,8 +555,7 @@ fhandler_base::open (int flags, mode_t mode) goto done; } - InitializeObjectAttributes (&attr, pc.get_nt_native_path (upath, wpath), - OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE | OBJ_INHERIT, sa.lpSecurityDescriptor, NULL); switch (query_open ()) |