BufferedReader.java, [...]: New versions from classpath.

2003-06-14  Michael Koch  <konqueror@gmx.de>

	* java/io/BufferedReader.java,
	java/io/FileOutputStream.java:
	New versions from classpath.

From-SVN: r67932

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 24a8e9dbaf728796e88b7f883db393ea20db1a55..094727933854428aa7f81d5061d0700ec898d735 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-14  Michael Koch  <konqueror@gmx.de>
+
+       * java/io/BufferedReader.java,
+       java/io/FileOutputStream.java:
+       New versions from classpath.
+
 2003-06-12  Andrew Haley  <aph@redhat.com>
 
        * prims.cc (catch_segv): Create exception in handler.

diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java
index eb2e2d29efe696862a12e3cac10ae0ea8b6d3144..46c9e417b1be9c5cae4ce61ceeed1c198ffb583c 100644 (file)
--- a/libjava/java/io/BufferedReader.java
+++ b/libjava/java/io/BufferedReader.java
@@ -164,6 +164,9 @@ public class BufferedReader extends Reader
    */
   public void mark(int readLimit) throws IOException
   {
+    if (readLimit < 0)
+      throw new IllegalArgumentException();
+
     synchronized (lock)
       {
        checkStatus();

diff --git a/libjava/java/io/FileOutputStream.java b/libjava/java/io/FileOutputStream.java
index f4488dcca9358e5c6aa4082212b9277046520c5b..125435066438f1e03e156bd154aa60ce3918cf73 100644 (file)
--- a/libjava/java/io/FileOutputStream.java
+++ b/libjava/java/io/FileOutputStream.java
@@ -85,7 +85,8 @@ public class FileOutputStream extends OutputStream
     if (s != null)
       s.checkWrite(path);
     fd = new FileDescriptor (path, (append
-                                   ? FileDescriptor.APPEND
+                                   ? FileDescriptor.WRITE
+                                     | FileDescriptor.APPEND
                                    : FileDescriptor.WRITE));
   }