From 3ab37c7de76a6e34d40c9c9bd9a0101d9accfb33 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 19 Aug 2003 11:59:56 +0000 Subject: [PATCH] re PR libgcj/11575 ([win32] Problem with RandomAccessFile) PR libgcj/11575 * java/io/natFileDescriptorWin32.cc (open): Set create flag to OPEN_AWAYS when READ & WRITE regardless of APPEND flag. Honor EXCL when openning with WRITE flag. From-SVN: r70565 --- libjava/ChangeLog | 7 +++++++ libjava/java/io/natFileDescriptorWin32.cc | 21 +++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 95ccb648c9b..7fc2069a6ff 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-08-19 Danny Smith + + PR libgcj/11575 + * java/io/natFileDescriptorWin32.cc (open): Set create + flag to OPEN_AWAYS when READ & WRITE regardless of APPEND flag. + Honor EXCL when openning with WRITE flag. + 2003-08-19 Mohan Embar * include/jvm.h: New class _Jv_TempUTFString (helper class for diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc index 210eb73cbbb..50669875ea1 100644 --- a/libjava/java/io/natFileDescriptorWin32.cc +++ b/libjava/java/io/natFileDescriptorWin32.cc @@ -97,20 +97,25 @@ java::io::FileDescriptor::open (jstring path, jint jflags) { if ((jflags & READ) && (jflags & WRITE)) { access = GENERIC_READ | GENERIC_WRITE; - if (jflags & APPEND) - create = OPEN_ALWAYS; + if (jflags & EXCL) + create = CREATE_NEW; // this will raise error if file exists. else - create = CREATE_ALWAYS; + create = OPEN_ALWAYS; // equivalent to O_CREAT } - else if(jflags & READ) - access = GENERIC_READ; - else + else if (jflags & READ) { + access = GENERIC_READ; + create = OPEN_EXISTING; // ignore EXCL + } + else + { access = GENERIC_WRITE; - if (jflags & APPEND) + if (jflags & EXCL) + create = CREATE_NEW; + else if (jflags & APPEND) create = OPEN_ALWAYS; else - create = CREATE_ALWAYS; + create = CREATE_ALWAYS; } handle = CreateFile(buf, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create, 0, NULL); -- 2.30.2