Update.
2002-04-15 Bruno Haible <bruno@clisp.org>
* iconvdata/armscii-8.c (BODY for FROM_LOOP): Fix array access.
(BODY for TO_LOOP): Likewise.
* iconvdata/tcvn5712-1.c (from_ucs4): Map U+0309 to 0xB1.
* iconvdata/tst-table.sh: Add support for encodings which contain
precomposed Unicode characters, known to the iconv converter in both
directions but not listed in the charmap.
* iconvdata/IBM856.irreversible: New file.
* iconvdata/IBM922.irreversible: New file.
* iconvdata/IBM1132.irreversible: New file.
* iconvdata/IBM1133.irreversible: New file.
* iconvdata/IBM1160.irreversible: New file.
* iconvdata/IBM1161.irreversible: New file.
* iconvdata/IBM1163.irreversible: New file.
* iconvdata/IBM1164.irreversible: New file.
* iconvdata/ARMSCII-8.irreversible: New file.
* iconvdata/TCVN5712-1.precomposed: New file.
* iconvdata/tst-tables.sh: Add IBM856, IBM922, IBM1124, IBM1129,
IBM1160, IBM1161, IBM1132, IBM1133, IBM1162, IBM1163, IBM1164,
ARMSCII-8, TCVN5712-1.
* iconvdata/Makefile (distribute): Add IBM856.irreversible,
IBM922.irreversible, IBM1132.irreversible, IBM1133.irreversible,
IBM1160.irreversible, IBM1161.irreversible, IBM1163.irreversible,
IBM1164.irreversible, ARMSCII-8.irreversible, TCVN5712-1.precomposed.
2002-04-17 Jakub Jelinek <jakub@redhat.com>
* time/tst-mktime.c: Include <stdlib.h>. Use %d, not %ld format
for EVENING69. Include offsets in TZ environment variable.
2002-04-19 07:49:16 +00:00
|
|
|
/* Conversion to and from ARMSCII-8
|
2022-01-01 18:54:23 +00:00
|
|
|
Copyright (C) 1997-2022 Free Software Foundation, Inc.
|
2001-12-01 07:10:53 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2001-12-01 07:10:53 +00:00
|
|
|
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
|
|
#define CHARSET_NAME "ARMSCII-8//"
|
|
|
|
#define FROM_LOOP from_armscii_8
|
|
|
|
#define TO_LOOP to_armscii_8
|
|
|
|
#define DEFINE_INIT 1
|
|
|
|
#define DEFINE_FINI 1
|
|
|
|
#define MIN_NEEDED_FROM 1
|
|
|
|
#define MIN_NEEDED_TO 4
|
2014-05-01 20:42:40 +00:00
|
|
|
#define ONE_DIRECTION 0
|
2001-12-01 07:10:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
static const uint16_t map_from_armscii_8[0xfe - 0xa2 + 1] =
|
|
|
|
{
|
|
|
|
0x0587, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab, 0x2014, 0x002e,
|
|
|
|
0x055d, 0x002c, 0x002d, 0x058a, 0x2026, 0x055c, 0x055b, 0x055e,
|
|
|
|
0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563, 0x0534, 0x0564,
|
|
|
|
0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567, 0x0538, 0x0568,
|
|
|
|
0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b, 0x053c, 0x056c,
|
|
|
|
0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f, 0x0540, 0x0570,
|
|
|
|
0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573, 0x0544, 0x0574,
|
|
|
|
0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577, 0x0548, 0x0578,
|
|
|
|
0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b, 0x054c, 0x057c,
|
|
|
|
0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f, 0x0550, 0x0580,
|
|
|
|
0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583, 0x0554, 0x0584,
|
|
|
|
0x0555, 0x0585, 0x0556, 0x0586, 0x055a
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* First define the conversion function from ARMSCII-8 to UCS4. */
|
|
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
|
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
|
|
|
#define LOOPFCT FROM_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint_fast8_t ch = *inptr; \
|
|
|
|
\
|
|
|
|
if (ch <= 0xa0) \
|
2004-02-07 15:57:44 +00:00
|
|
|
{ \
|
|
|
|
/* Upto and including 0xa0 the ARMSCII-8 corresponds to Unicode. */ \
|
|
|
|
*((uint32_t *) outptr) = ch; \
|
|
|
|
outptr += sizeof (uint32_t); \
|
|
|
|
} \
|
2001-12-01 07:10:53 +00:00
|
|
|
else if (ch >= 0xa2 && ch <= 0xfe) \
|
2004-02-07 15:57:44 +00:00
|
|
|
{ \
|
|
|
|
/* Use the table. */ \
|
|
|
|
*((uint32_t *) outptr) = map_from_armscii_8[ch - 0xa2]; \
|
|
|
|
outptr += sizeof (uint32_t); \
|
|
|
|
} \
|
2001-12-01 07:10:53 +00:00
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* This is an illegal character. */ \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
|
2001-12-01 07:10:53 +00:00
|
|
|
} \
|
|
|
|
\
|
|
|
|
++inptr; \
|
|
|
|
}
|
|
|
|
#define LOOP_NEED_FLAGS
|
2002-12-02 22:39:58 +00:00
|
|
|
#define ONEBYTE_BODY \
|
|
|
|
{ \
|
|
|
|
if (c <= 0xa0) \
|
|
|
|
/* Upto and including 0xa0 the ARMSCII-8 corresponds to Unicode. */ \
|
|
|
|
return c; \
|
|
|
|
else if (c >= 0xa2 && c <= 0xfe) \
|
|
|
|
/* Use the table. */ \
|
|
|
|
return map_from_armscii_8[c - 0xa2]; \
|
|
|
|
else \
|
|
|
|
return WEOF; \
|
|
|
|
}
|
2001-12-01 07:10:53 +00:00
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
|
|
|
|
static const unsigned char map_to_armscii_8[0x58a - 0x531 + 1] =
|
|
|
|
{
|
|
|
|
0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, 0xc0,
|
|
|
|
0xc2, 0xc4, 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xd0,
|
|
|
|
0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde, 0xe0,
|
|
|
|
0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0,
|
|
|
|
0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0x00, 0x00,
|
|
|
|
0x00, 0xfe, 0xb0, 0xaf, 0xaa, 0xb1, 0x00, 0x00,
|
|
|
|
0xb3, 0xb5, 0xb7, 0xb9, 0xbb, 0xbd, 0xbf, 0xc1,
|
|
|
|
0xc3, 0xc5, 0xc7, 0xc9, 0xcb, 0xcd, 0xcf, 0xd1,
|
|
|
|
0xd3, 0xd5, 0xd7, 0xd9, 0xdb, 0xdd, 0xdf, 0xe1,
|
|
|
|
0xe3, 0xe5, 0xe7, 0xe9, 0xeb, 0xed, 0xef, 0xf1,
|
|
|
|
0xf3, 0xf5, 0xf7, 0xf9, 0xfb, 0xfd, 0xa2, 0x00,
|
|
|
|
0xa3, 0xad
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Next, define the other direction. */
|
|
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
|
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
|
|
|
#define LOOPFCT TO_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint32_t ch = *((const uint32_t *) inptr); \
|
|
|
|
\
|
|
|
|
if (ch <= 0xa0) \
|
|
|
|
/* Upto and including 0xa0 the ARMSCII-8 corresponds to Unicode. */ \
|
|
|
|
*outptr = (unsigned char) ch; \
|
|
|
|
else if (ch == 0xab) \
|
|
|
|
*outptr = 0xa7; \
|
|
|
|
else if (ch == 0xbb) \
|
|
|
|
*outptr = 0xa6; \
|
|
|
|
else if (ch >= 0x531 && ch <= 0x58a) \
|
|
|
|
{ \
|
Update.
2002-04-15 Bruno Haible <bruno@clisp.org>
* iconvdata/armscii-8.c (BODY for FROM_LOOP): Fix array access.
(BODY for TO_LOOP): Likewise.
* iconvdata/tcvn5712-1.c (from_ucs4): Map U+0309 to 0xB1.
* iconvdata/tst-table.sh: Add support for encodings which contain
precomposed Unicode characters, known to the iconv converter in both
directions but not listed in the charmap.
* iconvdata/IBM856.irreversible: New file.
* iconvdata/IBM922.irreversible: New file.
* iconvdata/IBM1132.irreversible: New file.
* iconvdata/IBM1133.irreversible: New file.
* iconvdata/IBM1160.irreversible: New file.
* iconvdata/IBM1161.irreversible: New file.
* iconvdata/IBM1163.irreversible: New file.
* iconvdata/IBM1164.irreversible: New file.
* iconvdata/ARMSCII-8.irreversible: New file.
* iconvdata/TCVN5712-1.precomposed: New file.
* iconvdata/tst-tables.sh: Add IBM856, IBM922, IBM1124, IBM1129,
IBM1160, IBM1161, IBM1132, IBM1133, IBM1162, IBM1163, IBM1164,
ARMSCII-8, TCVN5712-1.
* iconvdata/Makefile (distribute): Add IBM856.irreversible,
IBM922.irreversible, IBM1132.irreversible, IBM1133.irreversible,
IBM1160.irreversible, IBM1161.irreversible, IBM1163.irreversible,
IBM1164.irreversible, ARMSCII-8.irreversible, TCVN5712-1.precomposed.
2002-04-17 Jakub Jelinek <jakub@redhat.com>
* time/tst-mktime.c: Include <stdlib.h>. Use %d, not %ld format
for EVENING69. Include offsets in TZ environment variable.
2002-04-19 07:49:16 +00:00
|
|
|
unsigned char oc = map_to_armscii_8[ch - 0x531]; \
|
2001-12-01 07:10:53 +00:00
|
|
|
\
|
|
|
|
if (oc == 0) \
|
|
|
|
/* No valid mapping. */ \
|
|
|
|
goto err; \
|
|
|
|
\
|
|
|
|
*outptr = oc; \
|
|
|
|
} \
|
|
|
|
else if (ch == 0x2014) \
|
|
|
|
*outptr = 0xa8; \
|
|
|
|
else if (ch == 0x2026) \
|
|
|
|
*outptr = 0xae; \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
UNICODE_TAG_HANDLER (ch, 4); \
|
|
|
|
\
|
|
|
|
/* We have an illegal character. */ \
|
|
|
|
err: \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_TO_LOOP_ERR_HANDLER (4); \
|
2001-12-01 07:10:53 +00:00
|
|
|
} \
|
|
|
|
++outptr; \
|
|
|
|
inptr += 4; \
|
|
|
|
}
|
|
|
|
#define LOOP_NEED_FLAGS
|
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
|
|
|
|
/* Now define the toplevel functions. */
|
|
|
|
#include <iconv/skeleton.c>
|