Our libc iconv (unlike gnu iconv and the citrus code in NetBSD) has a
bypass mode when src == dst. Unfortunately, there are tools in ports that pass byte streams through iconv to determine if the encodings are valid. eg: gettext-0.18.3+. Disable the optimization and behave like the other implementations.
This commit is contained in:
parent
9d2f243aa6
commit
f9562c1748
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=254080
@ -116,7 +116,20 @@ open_shared(struct _citrus_iconv_shared * __restrict * __restrict rci,
|
||||
size_t len_convname;
|
||||
int ret;
|
||||
|
||||
#ifdef INCOMPATIBLE_WITH_GNU_ICONV
|
||||
/*
|
||||
* Sadly, the gnu tools expect iconv to actually parse the
|
||||
* byte stream and don't allow for a pass-through when
|
||||
* the (src,dest) encodings are the same.
|
||||
* See gettext-0.18.3+ NEWS:
|
||||
* msgfmt now checks PO file headers more strictly with less
|
||||
* false-positives.
|
||||
* NetBSD don't do this either.
|
||||
*/
|
||||
module = (strcmp(src, dst) != 0) ? "iconv_std" : "iconv_none";
|
||||
#else
|
||||
module = "iconv_std";
|
||||
#endif
|
||||
|
||||
/* initialize iconv handle */
|
||||
len_convname = strlen(convname);
|
||||
|
Loading…
Reference in New Issue
Block a user