p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Don't bother with endianity" 

It makes iconv() output the byte order mark first...
This commit is contained in:
Přemysl Eric Janouch 2014-11-18 22:28:31 +01:00
parent f1f9a00cda
commit 64188f1fcf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
termo.c
View File

@ -330,9 +330,14 @@ termo_init (termo_t *tk, const char *term, const char *encoding)
if (!encoding) if (!encoding)
encoding = nl_langinfo (CODESET); encoding = nl_langinfo (CODESET);
if ((tk->to_utf32_conv = iconv_open ("UTF-32", encoding)) == (iconv_t) -1) // If we don't specify the endianity, iconv() outputs the BOM first
static const uint16_t endianity = 0x0102;
const char *utf32 = (*(uint8_t *) &endianity == 0x01)
? "UTF-32BE" : "UTF-32LE";
if ((tk->to_utf32_conv = iconv_open (utf32, encoding)) == (iconv_t) -1)
return 0; return 0;
if ((tk->from_utf32_conv = iconv_open (encoding, "UTF-32")) == (iconv_t) -1) if ((tk->from_utf32_conv = iconv_open (encoding, utf32)) == (iconv_t) -1)
goto abort_free_to_utf32; goto abort_free_to_utf32;
tk->buffer = malloc (tk->buffsize); tk->buffer = malloc (tk->buffsize);