| 6,6 → 6,10 |
|---|
| #include "../lib/kolibri.h" |
| #endif |
| |
| #ifndef INCLUDE_ENCODING_H |
| #include "../lib/encoding.h" |
| #endif |
| |
| dword iconv_lib = #a_iconv_lib; |
| char a_iconv_lib[]="/sys/lib/iconv.obj"; |
| |
| 23,12 → 27,7 |
|---|
| { |
| dword cd, in_len, out_len, new_buf; |
| |
| from_chs = from_chs*10+#charsets; |
| |
| //debug("iconv: from_chs = "); debugln(from_chs); |
| //debug("iconv: to_chs = "); debugln(to_chs); |
| |
| iconv_open stdcall (from_chs, to_chs); //CP866, CP1251, CP1252, KOI8-RU, UTF-8, ISO8859-5 |
| iconv_open stdcall (from_chs*10+#charsets, to_chs*10+#charsets); |
| if (EAX==-1) { |
| debugln("iconv: unsupported charset"); |
| return 0; |
| 35,19 → 34,20 |
|---|
| } |
| cd = EAX; |
| |
| in_len = out_len = strlen(conv_buf)+1; |
| new_buf = mem_Alloc(in_len); |
| in_len = strlen(conv_buf)+1; |
| out_len = in_len * 2; |
| new_buf = mem_Alloc(out_len); |
| iconv stdcall (cd, #conv_buf, #in_len, #new_buf, #out_len); |
| if (EAX!=0) |
| { |
| cd = EAX; |
| debugval("iconv: something is wrong with stdcall iconv()", cd); |
| debugval("in_len", in_len); |
| debugval("out_len", out_len); |
| new_buf = free(new_buf); |
| return conv_buf; |
| debugval("iconv failed", cd); |
| if (from_chs == CH_UTF8) && (to_chs == CH_CP866) { |
| utf8rutodos(conv_buf); |
| } |
| } else { |
| strcpy(conv_buf, new_buf); |
| } |
| free(new_buf); |
| return conv_buf; |
| } |