summaryrefslogtreecommitdiff
path: root/libarchive/archive_string.c
diff options
context:
space:
mode:
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>2011-06-07 11:49:22 -0400
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>2011-06-07 11:49:22 -0400
commitc1b91d01b746ad1b2450763a04a259911edf1126 (patch)
treecdfdd76c509e8df6b8bd703632577647b4956457 /libarchive/archive_string.c
parent8c9e5eea854b1f091348180855109c54c8ce0bc0 (diff)
downloadlibarchive-c1b91d01b746ad1b2450763a04a259911edf1126.tar.gz
Set SCONV_WIN_CP flag so that we use Windows API for UTF-16BE conversion
because IsValidCodePage(CP_UTF16BE) fails but we can handle it with byte-swapping. SVN-Revision: 3398
Diffstat (limited to 'libarchive/archive_string.c')
-rw-r--r--libarchive/archive_string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 5c6408ad..21f05512 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -1228,11 +1228,11 @@ create_sconv_object(const char *fc, const char *tc,
if (sc->to_cp == CP_UTF8)
flag |= SCONV_TO_UTF8;
else if (sc->to_cp == CP_UTF16BE)
- flag |= SCONV_TO_UTF16BE;
+ flag |= SCONV_TO_UTF16BE | SCONV_WIN_CP;
if (sc->from_cp == CP_UTF8)
flag |= SCONV_FROM_UTF8;
else if (sc->from_cp == CP_UTF16BE)
- flag |= SCONV_FROM_UTF16BE;
+ flag |= SCONV_FROM_UTF16BE | SCONV_WIN_CP;
#endif
/*