Changeset 1022 for trunk

Timestamp:

Jan 23, 2004, 3:56:14 AM (22 years ago)

Author:

bird

Message:

Rewrote and added a few more aliases and a transformation.

File:

• trunk/src/emx/src/lib/locale/__convcp.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/locale/__convcp.c

@@ -16 +16 @@
 void __convert_codepage (const char *cp, UniChar *ucp)
 {
-  size_t sl = 0;
+  static const struct _cp_aliases
+  {
+      const char *pszAlias;
+      const char *pszIBM;
+  } aAliases[] =
+  {   /* pszAlias   ->      pszIBM */
+      { "SYSTEM",           ""         },
+      { "ASCII",            "IBM-367"  },
+      { "UTF-8",            "IBM-1208" },
+      { "UTF-2",            "IBM-1200" },
+      { "UTF-2LE",          "IBM-1200" },
+      { "EUC-JP",           "IBM-954"  },
+      { "EUC-KR",           "IBM-970"  },
+      { "EUC-TW",           "IBM-964"  },
+      { "EUC-CN",           "IBM-1383" },
+      { "BIG5",             "IBM-950"  },
+  };
+  int       i;
+  size_t    sl;
 
-  if (!stricmp (cp, "SYSTEM"))
-    *ucp = 0;
-  else if (!stricmp (cp, "UTF-8"))
-    memcpy (ucp, L"IBM-1208", 9*2);
-  else if (!stricmp (cp, "UCS-2LE"))
-    memcpy (ucp, L"IBM-1200", 9*2);
-  else if (!stricmp (cp, "EUC-JP"))
-    memcpy (ucp, L"IBM-954", 8*2);
-  else if (!stricmp (cp, "EUC-KR"))
-    memcpy (ucp, L"IBM-970", 8*2);
-  else if (!stricmp (cp, "EUC-TW"))
-    memcpy (ucp, L"IBM-964", 8*2);
-  else if (!stricmp (cp, "EUC-CN"))
-    memcpy (ucp, L"IBM-1383", 9*2);
-  else if (!stricmp (cp, "BIG5"))
-    memcpy (ucp, L"IBM-950", 8*2);
-  else
+  /*
+   * Try aliases.
+   */
+  for (i = 0; i < sizeof(aAliases) / sizeof(aAliases[0]); i++ )
     {
-      /* Transform CPXXX naming style to IBM-XXX style */
-      if ((cp[0] == 'C' || cp[0] == 'c') && (cp[1] == 'P' || cp[1] == 'p'))
+      if (!strcmp(cp, aAliases[i].pszAlias))
         {
-          ucp[sl++] = 'I';
-          ucp[sl++] = 'B';
-          ucp[sl++] = 'M';
-          ucp[sl++] = '-';
-          cp += 2;
+          cp = aAliases[i].pszIBM;
+          while ((*ucp++ = *cp++) != 0)
+              /* nada */;
+          return;
         }
+    }
 
-      while (*cp != '\0')
-        ucp[sl++] = *cp++;
-      ucp[sl] = 0;
+  /*
+   * Generic transformations:
+   *    CPxxxx     -> IBM-xxxx
+   *    ISO-xxxx-x -> ISOxxxx-x
+   */
+  sl = 0;
+  /* Transform CPXXX naming style to IBM-XXX style */
+  if ((cp[0] == 'C' || cp[0] == 'c')
+   && (cp[1] == 'P' || cp[1] == 'p'))
+    {
+      ucp[sl++] = 'I';
+      ucp[sl++] = 'B';
+      ucp[sl++] = 'M';
+      ucp[sl++] = '-';
+      cp += 2;
     }
+  /* Transform ISO-XXXX-X naming style to ISOXXXX-X style */
+  else if ((cp[0] == 'I' || cp[0] == 'i')
+        && (cp[1] == 'S' || cp[1] == 's')
+        && (cp[2] == 'O' || cp[2] == 'o')
+        && (cp[3] == '-'))
+  {
+      ucp[sl++] = 'I';
+      ucp[sl++] = 'S';
+      ucp[sl++] = 'O';
+      cp += 4;
+  }
+
+  /* copy the rest of the string. */
+  while (*cp != '\0')
+    ucp[sl++] = *cp++;
+  ucp[sl] = 0;
 }