freebsd-ports/textproc/libxml2/files/patch-encoding.c
Hiroki Sato 839dc18139 - Add STAGEDIR support.
- Use *_CONFIGURE_WITH.
- Add workaround for an iconv incompatibility on 10.X and later.
2013-11-25 08:31:27 +00:00

21 lines
690 B
C

--- encoding.c.orig 2012-05-08 22:55:13.000000000 +0900
+++ encoding.c 2013-11-22 04:59:54.000000000 +0900
@@ -1789,13 +1789,18 @@
const char *icv_in = (const char *) in;
char *icv_out = (char *) out;
int ret;
+ int one;
+ one = 1;
if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || (in == NULL)) {
if (outlen != NULL) *outlen = 0;
return(-1);
}
icv_inlen = *inlen;
icv_outlen = *outlen;
+#ifdef ICONV_SET_ILSEQ_INVALID
+ iconvctl(cd, ICONV_SET_ILSEQ_INVALID, &one);
+#endif
ret = iconv(cd, (ICONV_CONST char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
*inlen -= icv_inlen;
*outlen -= icv_outlen;