summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2007-05-30 09:56:56 +0000
committerMark Wielaard <mark@klomp.org>2007-05-30 09:56:56 +0000
commitfa892c142172cbe37e994c51cb8235c3e7433dd5 (patch)
treeaa04f6127b68317071685030bfeae9083af47598
parent380352eba8eea0b969fc771702dba36254316287 (diff)
downloadclasspath-fa892c142172cbe37e994c51cb8235c3e7433dd5.tar.gz
2007-05-30 Mark Wielaard <mark@klomp.org>
Fixes bug #32030 reported by Steve.Blackburn@anu.edu.au * native/jni/java-nio/gnu_java_nio_VMChannel.c (Java_gnu_java_nio_VMChannel_open): Only set O_TRUNC on CPNIO_APPEND and O_WRONLY.
-rw-r--r--ChangeLog19
-rw-r--r--native/jni/java-nio/gnu_java_nio_VMChannel.c2
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 59b10d937..10fa73267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,21 @@
+2007-05-30 Mark Wielaard <mark@klomp.org>
+
+ Fixes bug #32030 reported by Steve.Blackburn@anu.edu.au
+ * native/jni/java-nio/gnu_java_nio_VMChannel.c
+ (Java_gnu_java_nio_VMChannel_open): Only set O_TRUNC on CPNIO_APPEND
+ and O_WRONLY.
+
2007-05-25 Robert Schuster <robertschuster@fsfe.org>
- * gnu/java/awt/peer/x/XGraphics2D.java:
- (rawDrawLine): Added addition of translation.
- (rawFillRect): Dito.
+ * gnu/java/awt/peer/x/XGraphics2D.java:
+ (rawDrawLine): Added addition of translation.
+ (rawFillRect): Dito.
2007-05-25 Robert Schuster <robertschuster@fsfe.org>
- * gnu/java/awt/font/opentype/OpenTypeFont.java:
- (getGlyphIndex): Call getGlyphCharMap() instead of
- accessing cmap field directly.
+ * gnu/java/awt/font/opentype/OpenTypeFont.java:
+ (getGlyphIndex): Call getGlyphCharMap() instead of
+ accessing cmap field directly.
2007-05-24 Ito Kazumitsu <kaz@maczuka.gcd.org>
diff --git a/native/jni/java-nio/gnu_java_nio_VMChannel.c b/native/jni/java-nio/gnu_java_nio_VMChannel.c
index 786b0026e..346845ee8 100644
--- a/native/jni/java-nio/gnu_java_nio_VMChannel.c
+++ b/native/jni/java-nio/gnu_java_nio_VMChannel.c
@@ -1676,7 +1676,7 @@ Java_gnu_java_nio_VMChannel_open (JNIEnv *env,
nmode = (nmode
| ((nmode == O_RDWR || nmode == O_WRONLY) ? O_CREAT : 0)
| ((mode & CPNIO_APPEND) ? O_APPEND :
- ((nmode == O_RDWR || nmode == O_WRONLY) ? O_TRUNC : 0))
+ ((nmode == O_WRONLY) ? O_TRUNC : 0))
| ((mode & CPNIO_EXCL) ? O_EXCL : 0)
| ((mode & CPNIO_SYNC) ? O_SYNC : 0));