sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

More fixes for iconv

Browse Source 
git-svn-id: svn://kolibrios.org@7044 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
ashmew2 2017-10-03 19:57:02 +00:00
parent 7ed0962aa5
commit f44791aeb7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/develop/libraries/iconv/iconv.c
View File

@ -61,6 +61,7 @@ int encoding(char *what) {
if (!strcmp(what,"CP866")) return CP866; if (!strcmp(what,"CP866")) return CP866;
if (!strcmp(what,"CP1251")) return CP1251; if (!strcmp(what,"CP1251")) return CP1251;
if (!strcmp(what,"windows-1252")) return CP1252; if (!strcmp(what,"windows-1252")) return CP1252;
if (!strcmp(what,"Windows-1252")) return CP1252;
if (!strcmp(what,"CP1252")) return CP1252; if (!strcmp(what,"CP1252")) return CP1252;
if (!strcmp(what,"KOI8-RU")) return KOI8_RU; if (!strcmp(what,"KOI8-RU")) return KOI8_RU;
if (!strcmp(what,"ISO8859-5")) return ISO8859_5; if (!strcmp(what,"ISO8859-5")) return ISO8859_5;
@ -71,8 +72,10 @@ int encoding(char *what) {
iconv_t iconv_open(const char *tocode, const char *fromcode) { iconv_t iconv_open(const char *tocode, const char *fromcode) {
int to, from; int to, from;
if ((to=encoding(tocode))==-1) return -1; if ((to=encoding(tocode))==-1) return -1;
if ((from=encoding(fromcode))==-1) return -1; if ((from=encoding(fromcode))==-1) return -1;
to=to<<16&0xFFFF0000; to=to<<16&0xFFFF0000;
from=from&0xFFFF; from=from&0xFFFF;
return to+from; return to+from;
@ -158,6 +161,7 @@ size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft,
(*inbytesleft)-=converted; (*inbytesleft)-=converted;
(*outbytesleft)-=written; (*outbytesleft)-=written;
(*outbuf)+=written;
count1+=converted; count1+=converted;
count2+=written; count2+=written;
} }