diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-08-02 19:56:53 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-08-02 19:56:53 +0000 |
| commit | f9427d170488c89fc8f2f4eed47b7feca4b32296 (patch) | |
| tree | 0c8d1667b236d225c6148e9a0990ef2a665f3fca /libjava/gnu/gcj/convert/BytesToUnicode.java | |
| parent | 5f51a7528fa1d1cee55a664b71dd3b3a08151ffc (diff) | |
| download | gcc-f9427d170488c89fc8f2f4eed47b7feca4b32296.zip gcc-f9427d170488c89fc8f2f4eed47b7feca4b32296.tar.gz gcc-f9427d170488c89fc8f2f4eed47b7feca4b32296.tar.bz2 | |
encodings.pl: New file.
* 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.
From-SVN: r35432
Diffstat (limited to 'libjava/gnu/gcj/convert/BytesToUnicode.java')
| -rw-r--r-- | libjava/gnu/gcj/convert/BytesToUnicode.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java index 92836e0..d80ed65 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 _) |