From: membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Aug 2003 11:59:56 +0000 (+0000)
Subject: 	PR libgcj/11575
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e9d74f8db463d04bef33f76a3d6fd5cd0400bb0;p=thirdparty%2Fgcc.git

	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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70565 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 95ccb648c9be..7fc2069a6ff6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-19  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	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  <gnustuff@thisiscool.com>
 
 	* 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 210eb73cbbbc..50669875ea1b 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);