From 65d0fdfa264aefe3cd73493b55afca39b87811be Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 2 Aug 2000 19:56:53 +0000 Subject: * scripts/encodings.pl: New file. * Makefile.in: Rebuilt. * Makefile.am (convert_source_files): Added IOConverter.java. * gnu/gcj/convert/UnicodeToBytes.java (UnicodeToBytes): Extend IOConverter. (getDefaultDecodingClass): Canonicalize default encoding name. (getEncoder): Likewise. * gnu/gcj/convert/BytesToUnicode.java (BytesToUnicode): Extend IOConverter. (getDefaultDecodingClass): Canonicalize default encoding name. (getDecoder): Likewise. * gnu/gcj/convert/IOConverter.java: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35432 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/convert/BytesToUnicode.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/gcj/convert/BytesToUnicode.java') diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java index 92836e0e703..d80ed6570d8 100644 --- a/libjava/gnu/gcj/convert/BytesToUnicode.java +++ b/libjava/gnu/gcj/convert/BytesToUnicode.java @@ -8,7 +8,7 @@ details. */ package gnu.gcj.convert; -public abstract class BytesToUnicode +public abstract class BytesToUnicode extends IOConverter { /** Buffer to read bytes from. * The characters inbuffer[inpos] ... inbuffer[inlength-1] are available. */ @@ -25,7 +25,7 @@ public abstract class BytesToUnicode // Test (defaultDecodingClass == null) again in case of race condition. if (defaultDecodingClass == null) { - String encoding = System.getProperty("file.encoding"); + String encoding = canonicalize (System.getProperty("file.encoding")); String className = "gnu.gcj.convert.Input_"+encoding; try { @@ -60,7 +60,7 @@ public abstract class BytesToUnicode public static BytesToUnicode getDecoder (String encoding) throws java.io.UnsupportedEncodingException { - String className = "gnu.gcj.convert.Input_"+encoding; + String className = "gnu.gcj.convert.Input_" + canonicalize (encoding); Class decodingClass; try { @@ -71,6 +71,8 @@ public abstract class BytesToUnicode { try { + // We pass the original name to iconv and let it handle + // its own aliasing. return new Input_iconv (encoding); } catch (Throwable _) -- cgit v1.2.3