Commit 47906032 by Tom Tromey Committed by Tom Tromey

re PR libgcj/6301 (gij -jar does not work)

	* java/io/BufferedReader.java (fill): Handle case where markPos
	point to ignored \n.  Fixes PR libgcj/6301.

From-SVN: r52982
parent 8e8c38cd
2002-04-30 Tom Tromey <tromey@redhat.com>
* java/io/BufferedReader.java (fill): Handle case where markPos
point to ignored \n. Fixes PR libgcj/6301.
2002-04-29 Gerhard Tonn <GerhardTonn@swol.de> 2002-04-29 Gerhard Tonn <GerhardTonn@swol.de>
* java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN for S/390. * java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN for S/390.
......
/* BufferedReader.java /* BufferedReader.java
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
...@@ -355,7 +355,12 @@ public class BufferedReader extends Reader ...@@ -355,7 +355,12 @@ public class BufferedReader extends Reader
if (retAtEndOfBuffer && buffer[pos] == '\n') if (retAtEndOfBuffer && buffer[pos] == '\n')
{ {
--count; --count;
pos++; // If the mark was set to the location of the \n, then we
// must change it to fully pretend that the \n does not
// exist.
if (markPos == pos)
++markPos;
++pos;
} }
return count; return count;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment