> > when setting utf-8 for cmd.exe, gpg switches back to its default
> > character set. In cmd.exe I do the follwoing to change the codepage:
> > [chcp 65001] Active Codepage: 65001.
> > gpg: conversion from `utf-8' to `CP65001' not available
> > gpg: using character set `iso-8859-1'
>
> The name mapping between 65001 local CP and UTF-8 standard name is
> lacking both in GnuPG util/strgutil.c, and in libiconv-1.9.2
> libcharset/lib/localcharset.c. This lack should be easy to correct.
Regarding localcharset.c, you are right. Please use the appended patch,
which I'll also use in libiconv-1.10.
Bruno
2005-07-02 Bruno Haible <[EMAIL PROTECTED]>
* localcharset.c (get_charset_aliases) [WIN32]: Add CP65001 and others.
Reported by <[EMAIL PROTECTED]> via Alain Bench <[EMAIL PROTECTED]>.
*** libiconv/lib/encodings.def.bak 2005-05-05 01:45:06.000000000 +0200
--- libiconv/lib/encodings.def 2005-07-02 17:54:29.000000000 +0200
***************
*** 56,61 ****
--- 56,62 ----
DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */
/*"UTF8", JDK 1.1 */
+ /*"CP65001", Windows */
),
utf8,
{ utf8_mbtowc, NULL }, { utf8_wctomb, NULL })
***************
*** 71,82 ****
--- 72,85 ----
"UNICODEBIG", /* glibc */
"UNICODE-1-1", /* IANA */
"csUnicode11", /* IANA */
+ /*"CP1201", Windows */
),
ucs2be,
{ ucs2be_mbtowc, NULL }, { ucs2be_wctomb, NULL })
DEFENCODING(( "UCS-2LE", /* glibc */
"UNICODELITTLE", /* glibc */
+ /*"CP1200", Windows */
),
ucs2le,
{ ucs2le_mbtowc, NULL }, { ucs2le_wctomb, NULL })
***************
*** 89,99 ****
--- 92,104 ----
{ ucs4_mbtowc, NULL }, { ucs4_wctomb, NULL })
DEFENCODING(( "UCS-4BE", /* glibc */
+ /*"CP12001", Windows */
),
ucs4be,
{ ucs4be_mbtowc, NULL }, { ucs4be_wctomb, NULL })
DEFENCODING(( "UCS-4LE", /* glibc */
+ /*"CP12000", Windows */
),
ucs4le,
{ ucs4le_mbtowc, NULL }, { ucs4le_wctomb, NULL })
***************
*** 131,136 ****
--- 136,142 ----
DEFENCODING(( "UTF-7", /* IANA, RFC 2152 */
"UNICODE-1-1-UTF-7", /* IANA, RFC 1642 */
"csUnicode11UTF7", /* IANA */
+ /*"CP65000", Windows */
),
utf7,
{ utf7_mbtowc, NULL }, { utf7_wctomb, utf7_reset })
***************
*** 178,183 ****
--- 184,190 ----
"csISOLatin1", /* IANA */
"ISO8859-1", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_1", JDK 1.1 */
+ /*"CP28591", Windows */
),
iso8859_1,
{ iso8859_1_mbtowc, NULL }, { iso8859_1_wctomb, NULL })
***************
*** 191,196 ****
--- 198,204 ----
"csISOLatin2", /* IANA */
"ISO8859-2", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_2", JDK 1.1 */
+ /*"CP28592", Windows */
),
iso8859_2,
{ iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL })
***************
*** 204,209 ****
--- 212,218 ----
"csISOLatin3", /* IANA */
"ISO8859-3", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_3", JDK 1.1 */
+ /*"CP28593", Windows */
),
iso8859_3,
{ iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL })
***************
*** 217,222 ****
--- 226,232 ----
"csISOLatin4", /* IANA */
"ISO8859-4", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_4", JDK 1.1 */
+ /*"CP28594", Windows */
),
iso8859_4,
{ iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL })
***************
*** 229,234 ****
--- 239,245 ----
"csISOLatinCyrillic", /* IANA */
"ISO8859-5", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_5", JDK 1.1 */
+ /*"CP28595", Windows */
),
iso8859_5,
{ iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL })
***************
*** 243,248 ****
--- 254,260 ----
"csISOLatinArabic", /* IANA */
"ISO8859-6", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_6", JDK 1.1 */
+ /*"CP28596", Windows */
),
iso8859_6,
{ iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL })
***************
*** 259,264 ****
--- 271,277 ----
"csISOLatinGreek", /* IANA */
"ISO8859-7", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_7", JDK 1.1 */
+ /*"CP28597", Windows */
),
iso8859_7,
{ iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL })
***************
*** 271,276 ****
--- 284,291 ----
"csISOLatinHebrew", /* IANA */
"ISO8859-8", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_8", JDK 1.1 */
+ /*"CP28598", Windows */
+ /*"CP38598", Windows */
),
iso8859_8,
{ iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL })
***************
*** 284,289 ****
--- 299,305 ----
"csISOLatin5", /* IANA */
"ISO8859-9", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_9", JDK 1.1 */
+ /*"CP28599", Windows */
),
iso8859_9,
{ iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL })
***************
*** 335,340 ****
--- 351,357 ----
"ISO-IR-203",
"LATIN-9", /* IANA */
"ISO8859-15", /* glibc, FreeBSD */
+ /*"CP28605", Windows */
),
iso8859_15,
{ iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL })
***************
*** 352,357 ****
--- 369,375 ----
DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
"csKOI8R", /* IANA */
+ /*"CP20866", Windows */
),
koi8_r,
{ koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL })
***************
*** 464,524 ****
--- 482,554 ----
"MACINTOSH", /* IANA */
"MAC", /* IANA */
"csMacintosh", /* IANA */
+ /*"CP10000", Windows */
),
mac_roman,
{ mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL })
DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */
+ /*"CP10029", Windows */
),
mac_centraleurope,
{ mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
DEFENCODING(( "MacIceland", /* JDK 1.1 */
+ /*"CP10079", Windows */
),
mac_iceland,
{ mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
DEFENCODING(( "MacCroatian", /* JDK 1.1 */
+ /*"CP10082", Windows */
),
mac_croatian,
{ mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
DEFENCODING(( "MacRomania", /* JDK 1.1 */
+ /*"CP10010", Windows */
),
mac_romania,
{ mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
DEFENCODING(( "MacCyrillic", /* JDK 1.1 */
+ /*"CP10007", Windows */
),
mac_cyrillic,
{ mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
DEFENCODING(( "MacUkraine", /* JDK 1.1 */
+ /*"CP10017", Windows */
),
mac_ukraine,
{ mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
DEFENCODING(( "MacGreek", /* JDK 1.1 */
+ /*"CP10006", Windows */
),
mac_greek,
{ mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL })
DEFENCODING(( "MacTurkish", /* JDK 1.1 */
+ /*"CP10081", Windows */
),
mac_turkish,
{ mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
DEFENCODING(( "MacHebrew", /* JDK 1.1 */
+ /*"CP10005", Windows */
),
mac_hebrew,
{ mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL })
DEFENCODING(( "MacArabic", /* JDK 1.1 */
+ /*"CP10004", Windows */
),
mac_arabic,
{ mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL })
DEFENCODING(( "MacThai", /* JDK 1.1 */
+ /*"CP10021", Windows */
),
mac_thai,
{ mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL })
***************
*** 703,708 ****
--- 733,739 ----
"Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
"csEUCPkdFmtJapanese", /* IANA */
/*"EUC_JP", JDK 1.1 */
+ /*"CP51932", Windows */
),
euc_jp,
{ euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL })
***************
*** 745,750 ****
--- 776,782 ----
"CN-GB", /* RFC 1922 */
"csGB2312", /* IANA */
/*"EUC_CN", JDK 1.1 */
+ /*"CP51936", Windows */
),
euc_cn,
{ euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL })
***************
*** 758,763 ****
--- 790,796 ----
{ ces_gbk_mbtowc, NULL }, { ces_gbk_wctomb, NULL })
DEFENCODING(( "GB18030", /* IANA, glibc */
+ /*"CP54936", Windows */
),
gb18030,
{ gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL })
***************
*** 784,789 ****
--- 817,823 ----
"EUCTW", /* glibc */
"csEUCTW",
/*"EUC_TW", JDK 1.1 */
+ /*"CP51950", Windows */
),
euc_tw,
{ euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL })
***************
*** 813,818 ****
--- 847,853 ----
"EUCKR", /* glibc */
"csEUCKR", /* IANA */
/*"EUC_KR", JDK 1.1 */
+ /*"CP51949", Windows */
),
euc_kr,
{ euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL })
*** libiconv/libcharset/lib/localcharset.c.bak 2004-04-28 13:01:45.000000000 +0200
--- libiconv/libcharset/lib/localcharset.c 2005-07-02 18:01:34.000000000 +0200
***************
*** 1,6 ****
/* Determine a canonical name for the current locale's character encoding.
! Copyright (C) 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,6 ----
/* Determine a canonical name for the current locale's character encoding.
! Copyright (C) 2000-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 249,254 ****
--- 249,255 ----
"CP1361" "\0" "JOHAB" "\0"
"CP20127" "\0" "ASCII" "\0"
"CP20866" "\0" "KOI8-R" "\0"
+ "CP20936" "\0" "GB2312" "\0"
"CP21866" "\0" "KOI8-RU" "\0"
"CP28591" "\0" "ISO-8859-1" "\0"
"CP28592" "\0" "ISO-8859-2" "\0"
***************
*** 259,265 ****
"CP28597" "\0" "ISO-8859-7" "\0"
"CP28598" "\0" "ISO-8859-8" "\0"
"CP28599" "\0" "ISO-8859-9" "\0"
! "CP28605" "\0" "ISO-8859-15" "\0";
# endif
#endif
--- 260,273 ----
"CP28597" "\0" "ISO-8859-7" "\0"
"CP28598" "\0" "ISO-8859-8" "\0"
"CP28599" "\0" "ISO-8859-9" "\0"
! "CP28605" "\0" "ISO-8859-15" "\0"
! "CP38598" "\0" "ISO-8859-8" "\0"
! "CP51932" "\0" "EUC-JP" "\0"
! "CP51936" "\0" "GB2312" "\0"
! "CP51949" "\0" "EUC-KR" "\0"
! "CP51950" "\0" "EUC-TW" "\0"
! "CP54936" "\0" "GB18030" "\0"
! "CP65001" "\0" "UTF-8" "\0";
# endif
#endif
_______________________________________________
Gnupg-users mailing list
[email protected]
http://lists.gnupg.org/mailman/listinfo/gnupg-users
