about summary refs log tree commit diff
path: root/iconvdata/armscii-8.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-19 07:49:16 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-19 07:49:16 +0000
commit9813858f9f94a58eef876a54cc369f286332a532 (patch)
tree3711fbceefbb97a9819a65b3b22ea30bf2c3ffea /iconvdata/armscii-8.c
parentb459976e27aee31b9be3b31cb6c95f35226f1a57 (diff)
downloadglibc-9813858f9f94a58eef876a54cc369f286332a532.tar.gz
glibc-9813858f9f94a58eef876a54cc369f286332a532.tar.xz
glibc-9813858f9f94a58eef876a54cc369f286332a532.zip
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.
Diffstat (limited to 'iconvdata/armscii-8.c')
-rw-r--r--iconvdata/armscii-8.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/iconvdata/armscii-8.c b/iconvdata/armscii-8.c
index ca2e689a49..685736eb7d 100644
--- a/iconvdata/armscii-8.c
+++ b/iconvdata/armscii-8.c
@@ -1,5 +1,5 @@
-/* Conversion to and from ISO 8859-1.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Conversion to and from ARMSCII-8
+   Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -61,7 +61,7 @@ static const uint16_t map_from_armscii_8[0xfe - 0xa2 + 1] =
       *((uint32_t *) outptr)++ = ch;					      \
     else if (ch >= 0xa2 && ch <= 0xfe)					      \
       /* Use the table.  */						      \
-      *((uint32_t *) outptr)++ = map_from_armscii_8[ch];		      \
+      *((uint32_t *) outptr)++ = map_from_armscii_8[ch - 0xa2];		      \
     else								      \
       {									      \
 	/* This is an illegal character.  */				      \
@@ -114,7 +114,7 @@ static const unsigned char map_to_armscii_8[0x58a - 0x531 + 1] =
       *outptr = 0xa6;							      \
     else if (ch >= 0x531 && ch <= 0x58a)				      \
       {									      \
-	unsigned char oc = map_to_armscii_8[ch];			      \
+	unsigned char oc = map_to_armscii_8[ch - 0x531];		      \
 									      \
 	if (oc == 0)							      \
 	  /* No valid mapping.  */					      \