1 files changed, 13 insertions, 8 deletions
diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc
index 210eb73..5066987 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);