FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

InputStreamReader.java (refill): Handle no-progress case correctly.

Browse source 
* java/io/InputStreamReader.java (refill): Handle no-progress
	case correctly.
	* gnu/gcj/convert/IOConverter.java: Add 'utf8' alias.

From-SVN: r101663
This commit is contained in:
Tom Tromey 2005-07-06 20:10:41 +00:00 • committed by Tom Tromey
parent 4b7d2f0796
commit 6dfb90cf55
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2005-07-06 Tom Tromey <tromey@redhat.com>
* java/io/InputStreamReader.java (refill): Handle no-progress
case correctly.
* gnu/gcj/convert/IOConverter.java: Add 'utf8' alias.
2005-07-06 Tom Tromey <tromey@redhat.com> 2005-07-06 Tom Tromey <tromey@redhat.com>
* testsuite/libjava.jacks/jacks.xfail: Removed 9.1.3-body-5. * testsuite/libjava.jacks/jacks.xfail: Removed 9.1.3-body-5.

4
libjava/gnu/gcj/convert/IOConverter.java
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2001 Free Software Foundation /* Copyright (C) 2000, 2001, 2005 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -28,6 +28,8 @@ public abstract class IOConverter
// canonical name. // canonical name.
hash.put ("iso-latin-1", "8859_1"); hash.put ("iso-latin-1", "8859_1");
hash.put ("iso8859_1", "8859_1"); hash.put ("iso8859_1", "8859_1");
// At least one build script out there uses 'utf8'.
hash.put ("utf8", "UTF8");
// On Solaris the default encoding, as returned by nl_langinfo(), // On Solaris the default encoding, as returned by nl_langinfo(),
// is `646' (aka ASCII), but the Solaris iconv_open() doesn't // is `646' (aka ASCII), but the Solaris iconv_open() doesn't
// understand that. We work around the problem by adding an // understand that. We work around the problem by adding an

20
libjava/java/io/InputStreamReader.java
View file

@ -289,9 +289,23 @@ public class InputStreamReader extends Reader
return -1; return -1;
converter.setInput(in.buf, in.pos, in.count); converter.setInput(in.buf, in.pos, in.count);
int count = converter.read(buf, offset, length); int count = converter.read(buf, offset, length);
in.skip(converter.inpos - in.pos);
if (count > 0) // We might have bytes but not have made any progress. In
return count; // this case we try to refill. If refilling fails, we assume
// we have a malformed character at the end of the stream.
if (count == 0 && converter.inpos == in.pos)
{
in.mark(in.count);
if (! in.refill ())
throw new CharConversionException ();
in.reset();
}
else
{
in.skip(converter.inpos - in.pos);
if (count > 0)
return count;
}
} }
} }
} }