fixed strig-locale-upcase/downcase for windows with bogus locale
svn: r522
This commit is contained in:
parent
a180ebce2e
commit
e8c07c12a6
|
@ -2266,12 +2266,13 @@ static char *do_convert(iconv_t cd,
|
||||||
/* We assume that out + od is mzchar-aligned */
|
/* We assume that out + od is mzchar-aligned */
|
||||||
long ipos, opos;
|
long ipos, opos;
|
||||||
|
|
||||||
r = utf8_decode_x(in, id + dip, iilen - dip,
|
r = utf8_decode_x(in, id + dip, iilen,
|
||||||
(unsigned int *)out, (od + dop) >> 2, iolen >> 2,
|
(unsigned int *)out, (od + dop) >> 2, iolen >> 2,
|
||||||
&ipos, &opos,
|
&ipos, &opos,
|
||||||
0, 0, NULL, 0, 0);
|
0, 0, NULL, 0, 0);
|
||||||
|
|
||||||
opos <<= 2;
|
opos <<= 2;
|
||||||
dop += opos;
|
dop = (opos - od);
|
||||||
dip = (ipos - id);
|
dip = (ipos - id);
|
||||||
|
|
||||||
if ((r == -1) || (r == -2)) {
|
if ((r == -1) || (r == -2)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user