// canonical name.
hash.put ("iso-latin-1", "8859_1");
hash.put ("iso8859_1", "8859_1");
+ hash.put ("utf-16le", "UnicodeLittle");
+ hash.put ("utf-16be", "UnicodeBig");
// At least one build script out there uses 'utf8'.
hash.put ("utf8", "UTF8");
// On Solaris the default encoding, as returned by nl_langinfo(),
// understand that. We work around the problem by adding an
// explicit alias for Solaris users.
hash.put ("646", "ASCII");
+
+ // See PR 24552, PR 14358.
+ hash.put ("euc_jp", "EUCJIS");
+ hash.put ("eucjp", "EUCJIS");
+
// All aliases after this point are automatically generated by the
// `encodings.pl' script. Run it to make any corrections.
hash.put ("ansi_x3.4-1968", "ASCII");
- hash.put ("iso-ir-6", "ASCII");
hash.put ("ansi_x3.4-1986", "ASCII");
- hash.put ("iso_646.irv:1991", "ASCII");
hash.put ("ascii", "ASCII");
- hash.put ("iso646-us", "ASCII");
- hash.put ("us-ascii", "ASCII");
- hash.put ("us", "ASCII");
- hash.put ("ibm367", "ASCII");
hash.put ("cp367", "ASCII");
+ hash.put ("cp819", "8859_1");
hash.put ("csascii", "ASCII");
- hash.put ("iso_8859-1:1987", "8859_1");
+ hash.put ("cseucpkdfmtjapanese", "EUCJIS");
+ hash.put ("csisolatin1", "8859_1");
+ hash.put ("csshiftjis", "SJIS");
+ hash.put ("euc-jp", "EUCJIS");
+ hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS");
+ hash.put ("ibm367", "ASCII");
+ hash.put ("ibm819", "8859_1");
+ hash.put ("iso-8859-1", "8859_1");
hash.put ("iso-ir-100", "8859_1");
+ hash.put ("iso-ir-6", "ASCII");
+ hash.put ("iso646-us", "ASCII");
+ hash.put ("iso_646.irv:1991", "ASCII");
hash.put ("iso_8859-1", "8859_1");
- hash.put ("iso-8859-1", "8859_1");
- hash.put ("latin1", "8859_1");
+ hash.put ("iso_8859-1:1987", "8859_1");
hash.put ("l1", "8859_1");
- hash.put ("ibm819", "8859_1");
- hash.put ("cp819", "8859_1");
- hash.put ("csisolatin1", "8859_1");
- hash.put ("utf-8", "UTF8");
- hash.put ("none", "UTF8");
- hash.put ("shift_jis", "SJIS");
+ hash.put ("latin1", "8859_1");
hash.put ("ms_kanji", "SJIS");
- hash.put ("csshiftjis", "SJIS");
- hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS");
- hash.put ("cseucpkdfmtjapanese", "EUCJIS");
- hash.put ("euc-jp", "EUCJIS");
- hash.put ("euc-jp", "EUCJIS");
- hash.put ("utf-16le", "UnicodeLittle");
- hash.put ("utf-16be", "UnicodeBig");
+ hash.put ("shift_jis", "SJIS");
+ hash.put ("us", "ASCII");
+ hash.put ("us-ascii", "ASCII");
+ hash.put ("utf-8", "UTF8");
+ hash.put ("utf16-be", "UnicodeBig");
+ hash.put ("utf16-le", "UnicodeLittle");
+ // End script-generated section.
+
iconv_byte_swap = iconv_init ();
}
'ISO_8859-1:1987' => '8859_1',
'UTF-8' => 'UTF8',
'Shift_JIS' => 'SJIS',
- 'Extended_UNIX_Code_Packed_Format_for_Japanese' => 'EUCJIS'
+ 'Extended_UNIX_Code_Packed_Format_for_Japanese' => 'EUCJIS',
+ 'UTF16-LE' => 'UnicodeLittle',
+ 'UTF16-BE' => 'UnicodeBig'
);
if ($ARGV[0] eq '')
$file = $ARGV[0];
}
+# Include canonical names in the output.
+foreach $key (keys %map)
+{
+ $output{lc ($key)} = $map{$key};
+}
+
open (INPUT, "< $file") || die "couldn't open $file: $!";
$body = 0;
$current = $map{$name};
if ($current)
{
- print " hash.put (\"$lower\", \"$current\");\n";
+ $output{$lower} = $current;
}
}
elsif ($type eq 'Alias:')
{
# The IANA list has some ugliness.
- if ($name ne '' && $name ne 'NONE' && $current)
+ if ($name ne '' && $lower ne 'none' && $current)
{
- print " hash.put (\"$lower\", \"$current\");\n";
+ $output{$lower} = $current;
}
}
}
close (INPUT);
+
+foreach $key (sort keys %output)
+{
+ print " hash.put (\"$key\", \"$output{$key}\");\n";
+}