aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2000-01-24 13:06:57 +0000
committerBruno Haible <bruno@clisp.org>2000-01-24 13:06:57 +0000
commitc37afd43bd7b180d4e1389e3d1f01220a10b2b3e (patch)
tree32cd21ae4d1c5add0896889758d840dfb3e2ca12 /man
parent00e960fcc0e65c7f5c1269c7e87e13daee158b9c (diff)
downloadandroid-libiconv-c37afd43bd7b180d4e1389e3d1f01220a10b2b3e.tar.gz
android-libiconv-c37afd43bd7b180d4e1389e3d1f01220a10b2b3e.tar.bz2
android-libiconv-c37afd43bd7b180d4e1389e3d1f01220a10b2b3e.zip
Upgrade to libiconv-1.1.
Diffstat (limited to 'man')
-rw-r--r--man/iconv.311
-rw-r--r--man/iconv_open.39
2 files changed, 11 insertions, 9 deletions
diff --git a/man/iconv.3 b/man/iconv.3
index 397e094..be8f130 100644
--- a/man/iconv.3
+++ b/man/iconv.3
@@ -9,7 +9,7 @@
.\" GNU glibc-2 source code and manual
.\" OpenGroup's Single Unix specification http://www.UNIX-systems.org/online.html
.\"
-.TH ICONV 3 "January 2, 2000" "GNU" "Linux Programmer's Manual"
+.TH ICONV 3 "January 22, 2000" "GNU" "Linux Programmer's Manual"
.SH NAME
iconv \- perform character set conversion
.SH SYNOPSIS
@@ -39,15 +39,16 @@ The conversion can stop for four reasons:
.PP
1. An invalid multibyte sequence is encountered in the input. In this case
it sets \fBerrno\fP to \fBEILSEQ\fP and returns (size_t)(-1). \fI*inbuf\fP
-is left pointing to the beginning of invalid multibyte sequence.
+is left pointing to the beginning of the invalid multibyte sequence.
.PP
2. The input byte sequence has been entirely converted, i.e. \fI*inbytesleft\fP
-has gone down to 0. In this case \fBiconv\fP returns the number of converted
-characters.
+has gone down to 0. In this case \fBiconv\fP returns the number of
+non-reversible conversions performed during this call.
.PP
3. An incomplete multibyte sequence is encountered in the input, and the
input byte sequence terminates after it. In this case it sets \fBerrno\fP to
-\fBEINVAL\fP and returns (size_t)(-1).
+\fBEINVAL\fP and returns (size_t)(-1). \fI*inbuf\fP is left pointing to the
+beginning of the incomplete multibyte sequence.
.PP
4. The output buffer has no more room for the next converted character. In
this case it sets \fBerrno\fP to \fBE2BIG\fP and returns (size_t)(-1).
diff --git a/man/iconv_open.3 b/man/iconv_open.3
index 26ebd04..94fba9a 100644
--- a/man/iconv_open.3
+++ b/man/iconv_open.3
@@ -9,7 +9,7 @@
.\" GNU glibc-2 source code and manual
.\" OpenGroup's Single Unix specification http://www.UNIX-systems.org/online.html
.\"
-.TH ICONV_OPEN 3 "January 3, 2000" "GNU" "Linux Programmer's Manual"
+.TH ICONV_OPEN 3 "January 18, 2000" "GNU" "Linux Programmer's Manual"
.SH NAME
iconv_open \- allocate descriptor for character set conversion
.SH SYNOPSIS
@@ -28,7 +28,8 @@ combinations are system dependent. For the libiconv library, the following
encodings are supported, in all combinations.
.TP
European languages
-ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15}, KOI8-R, KOI8-U, KOI8-RU,
+ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16},
+KOI8-R, KOI8-U, KOI8-RU,
CP{1250,1251,1252,1253,1254,1257}, CP{850,866},
Mac{Roman,CentralEurope,Iceland,Croatian,Romania},
Mac{Cyrillic,Ukraine,Greek,Turkish},
@@ -38,13 +39,13 @@ Semitic languages
ISO-8859-{6,8}, CP{1255,1256}, Mac{Hebrew,Arabic}
.TP
Japanese
-EUC-JP, SHIFT-JIS, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1
+EUC-JP, SHIFT-JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1
.TP
Chinese
EUC-CN, HZ, GBK, EUC-TW, BIG5, CP950, ISO-2022-CN, ISO-2022-CN-EXT
.TP
Korean
-EUC-KR, JOHAB, ISO-2022-KR
+EUC-KR, CP949, ISO-2022-KR
.TP
Armenian
ARMSCII-8