sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

r2164: put the latest "accept either form" utf-16 iconv code in samba4

Browse Source 
(This used to be commit 62a0cfd865d6ad4c05e2461dbf0b81988683a219)
This commit is contained in:
Andrew Tridgell 2004-09-01 05:19:00 +00:00 committed by Gerald (Jerry) Carter
parent 31c1c7846f
commit a08808d62b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/lib/iconv.c
View File

@ -161,6 +161,12 @@ size_t smb_iconv(smb_iconv_t cd,
return 0;
}
static BOOL is_utf16(const char *name)
{
return strcasecmp(name, "UCS-2LE") == 0 ||
strcasecmp(name, "UTF-16LE") == 0;
}
/*
simple iconv_open() wrapper
*/
@ -202,13 +208,17 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
#ifdef HAVE_NATIVE_ICONV
if (!from) {
ret->pull = sys_iconv;
ret->cd_pull = iconv_open("UCS-2LE", fromcode);
ret->cd_pull = iconv_open("UTF-16LE", fromcode);
if (ret->cd_pull == (iconv_t)-1)
ret->cd_pull = iconv_open("UCS-2LE", fromcode);
if (ret->cd_pull == (iconv_t)-1) goto failed;
}
if (!to) {
ret->push = sys_iconv;
ret->cd_push = iconv_open(tocode, "UCS-2LE");
ret->cd_push = iconv_open(tocode, "UTF-16LE");
if (ret->cd_push == (iconv_t)-1)
ret->cd_push = iconv_open(tocode, "UCS-2LE");
if (ret->cd_push == (iconv_t)-1) goto failed;
}
#else
@ -218,23 +228,23 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
#endif
/* check for conversion to/from ucs2 */
if (strcasecmp(fromcode, "UTF-16LE") == 0 && to) {
if (is_utf16(fromcode) && to) {
ret->direct = to->push;
return ret;
}
if (strcasecmp(tocode, "UTF-16LE") == 0 && from) {
if (is_utf16(tocode) && from) {
ret->direct = from->pull;
return ret;
}
#ifdef HAVE_NATIVE_ICONV
if (strcasecmp(fromcode, "UTF-16LE") == 0) {
if (is_utf16(fromcode)) {
ret->direct = sys_iconv;
ret->cd_direct = ret->cd_push;
ret->cd_push = NULL;
return ret;
}
if (strcasecmp(tocode, "UTF-16LE") == 0) {
if (is_utf16(tocode)) {
ret->direct = sys_iconv;
ret->cd_direct = ret->cd_pull;
ret->cd_pull = NULL;