From 68547d267ad180739043e7a57e967734df9907b0 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 11 Sep 2000 00:35:51 +0000 Subject: * gnu/gcj/convert/BytesToUnicode.java (getDefaultDecoder): Let default decoder use iconv. * gnu/gcj/convert/UnicodeToBytes.java (getDefaultEncoder): Let default encoder use iconv. * configure: Rebuilt. * configure.in: Check for nl_langinfo and . * java/lang/natSystem.cc (file_encoding): New function. (DEFAULT_FILE_ENCODING): Define to file_encoding() if possible. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36306 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/convert/BytesToUnicode.java | 9 ++++++++- libjava/gnu/gcj/convert/UnicodeToBytes.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java index d80ed6570d8..de116dd1396 100644 --- a/libjava/gnu/gcj/convert/BytesToUnicode.java +++ b/libjava/gnu/gcj/convert/BytesToUnicode.java @@ -52,7 +52,14 @@ public abstract class BytesToUnicode extends IOConverter } catch (Throwable ex) { - return new Input_8859_1(); + try + { + return new Input_iconv (System.getProperty ("file.encoding")); + } + catch (Throwable ex2) + { + return new Input_8859_1(); + } } } diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java index 1ba6ddf8065..dce7797fbaf 100644 --- a/libjava/gnu/gcj/convert/UnicodeToBytes.java +++ b/libjava/gnu/gcj/convert/UnicodeToBytes.java @@ -50,7 +50,14 @@ public abstract class UnicodeToBytes extends IOConverter } catch (Throwable ex) { - return new Output_8859_1(); + try + { + return new Output_iconv (System.getProperty ("file.encoding")); + } + catch (Throwable ex2) + { + return new Output_8859_1(); + } } } -- cgit v1.2.3