Update.

	* iconvdata/euc-jp.c: Map characters in C1 area to itself.
	* iconvdata/euc-kr.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 27ef3f9..1add3ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-06  Ulrich Drepper  <drepper@redhat.com>
 
+       * iconvdata/euc-jp.c: Map characters in C1 area to itself.
+       * iconvdata/euc-kr.c: Likewise.
+
        * stdio-common/vfprintf.c (process_string_arg): Check result of
        wcrtomb call and bail out if it failed.
 

diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index c6a39b0..8d84296 100644 (file)
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -45,10 +45,9 @@
   {                                                                          \
     uint32_t ch = *inptr;                                                    \
                                                                              \
-    if (ch <= 0x7f)                                                          \
+    if (ch < 0x8e || (ch >= 0x90 && ch <= 0x9f))                             \
       ++inptr;                                                               \
-    else if ((__builtin_expect (ch, 0xa1) <= 0xa0 && ch != 0x8e && ch != 0x8f)\
-            || __builtin_expect (ch, 0xfe) > 0xfe)                           \
+    else if (ch == 0xff)                                                     \
       {                                                                              \
        /* This is illegal.  */                                               \
        if (! ignore_errors_p ())                                             \
@@ -168,8 +167,8 @@
   {                                                                          \
     uint32_t ch = get32 (inptr);                                             \
                                                                              \
-    if (ch <= 0x7f)                                                          \
-      /* It's plain ASCII.  */                                               \
+    if (ch < 0x8e || (ch >= 0x90 && ch <= 0x9f))                             \
+      /* It's plain ASCII or C1.  */                                         \
       *outptr++ = ch;                                                        \
     else if (ch == 0xa5)                                                     \
       /* YEN sign => backslash  */                                           \

diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index abb40c8..7866958 100644 (file)
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -27,7 +27,7 @@
 static inline void
 euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 {
-  if (ch > 0x7f)
+  if (ch > 0x9f)
     {
       if (__builtin_expect (ucs4_to_ksc5601 (ch, cp, 2), 0)
          != __UNKNOWN_10646_CHAR)
@@ -75,12 +75,12 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
         ch = (uint32_t) inchar;                                              \
     */                                                                       \
                                                                              \
-    if (ch <= 0x7f)                                                          \
+    if (ch <= 0x9f)                                                          \
       /* Plain ASCII.  */                                                    \
       ++inptr;                                                               \
     /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are                   \
        user-defined areas.  */                                               \
-    else if (__builtin_expect (ch, 0xa1) <= 0xa0                             \
+    else if (__builtin_expect (ch, 0xa1) == 0xa0                             \
             || __builtin_expect (ch, 0xa1) > 0xfe                            \
             || __builtin_expect (ch, 0xa1) == 0xc9)                          \
       {                                                                              \

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 69982eb..6f64baa 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,7 @@
 2000-07-06  Ulrich Drepper  <drepper@redhat.com>
 
        * charmaps/EUC-JP: Make characters in C1 area map to themselves.
+       * charmaps/EUC-KR: Likewise.
 
 2000-07-06  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/localedata/charmaps/EUC-KR b/localedata/charmaps/EUC-KR
index 41e3cc1..82093f7 100644 (file)
--- a/localedata/charmaps/EUC-KR
+++ b/localedata/charmaps/EUC-KR
@@ -138,6 +138,42 @@ CHARMAP
 <U007F>     /x7f         DELETE\r
 \r
 %\r
+% C1 area.\r
+%\r
+<U0080>     /x80         PADDING CHARACTER (PAD)\r
+<U0081>     /x81         HIGH OCTET PRESET (HOP)\r
+<U0082>     /x82         BREAK PERMITTED HERE (BPH)\r
+<U0083>     /x83         NO BREAK HERE (NBH)\r
+<U0084>     /x84         INDEX (IND)\r
+<U0085>     /x85         NEXT LINE (NEL)\r
+<U0086>     /x86         START OF SELECTED AREA (SSA)\r
+<U0087>     /x87         END OF SELECTED AREA (ESA)\r
+<U0088>     /x88         CHARACTER TABULATION SET (HTS)\r
+<U0089>     /x89         CHARACTER TABULATION WITH JUSTIFICATION (HTJ)\r
+<U008A>     /x8a         LINE TABULATION SET (VTS)\r
+<U008B>     /x8b         PARTIAL LINE FORWARD (PLD)\r
+<U008C>     /x8c         PARTIAL LINE BACKWARD (PLU)\r
+<U008D>     /x8d         REVERSE LINE FEED (RI)\r
+<U008E>     /x8e         SINGLE-SHIFT TWO (SS2)\r
+<U008F>     /x8f         SINGLE-SHIFT THREE (SS3)\r
+<U0090>     /x90         DEVICE CONTROL STRING (DCS)\r
+<U0091>     /x91         PRIVATE USE ONE (PU1)\r
+<U0092>     /x92         PRIVATE USE TWO (PU2)\r
+<U0093>     /x93         SET TRANSMIT STATE (STS)\r
+<U0094>     /x94         CANCEL CHARACTER (CCH)\r
+<U0095>     /x95         MESSAGE WAITING (MW)\r
+<U0096>     /x96         START OF GUARDED AREA (SPA)\r
+<U0097>     /x97         END OF GUARDED AREA (EPA)\r
+<U0098>     /x98         START OF STRING (SOS)\r
+<U0099>     /x99         SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)\r
+<U009A>     /x9a         SINGLE CHARACTER INTRODUCER (SCI)\r
+<U009B>     /x9b         CONTROL SEQUENCE INTRODUCER (CSI)\r
+<U009C>     /x9c         STRING TERMINATOR (ST)\r
+<U009D>     /x9d         OPERATING SYSTEM COMMAND (OSC)\r
+<U009E>     /x9e         PRIVACY MESSAGE (PM)\r
+<U009F>     /x9f         APPLICATION PROGRAM COMMAND (APC)\r
+\r
+%\r
 % KS C 5601-1992\r
 %\r
 <UC7B8>     /xa0/x41     HANGUL SYLLABLE CIEUC-AE-RIEULSIOS\r