system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

iconv: only conditionally use ICONV_SET_DISCARD_ILSEQ

Browse source 
If the -c flag is used, then we can set it with ICONV_SET_DISCARD_ILSEQ;
otherwise, leave it alone.  The user may have specified //IGNORE in the
'to' codeset specification, there's no reason we can't allow that but
we'll currently turn it off.

Reviewed by:	thj
Sponsored by: Klara, Inc.
Differential Revision:	https://reviews.freebsd.org/D34342
This commit is contained in:
Kyle Evans 2022-02-21 23:05:28 -06:00
parent 814bd1ed43
commit ea0f37dec6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr.bin/iconv/iconv.c
View file

@ -77,9 +77,16 @@ do_conv(FILE *fp, iconv_t cd, bool silent, bool hide_invalid)
unsigned long long invalids;
size_t inbytes, outbytes, ret;
int arg = (int)hide_invalid;
if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&arg) == -1)
err(EXIT_FAILURE, "iconvctl(DISCARD_ILSEQ, %d)", arg);
/*
* Don't touch ICONV_SET_DISCARD_ILSEQ if -c wasn't specified. It may
* be that the user has specified //IGNORE in the -t specification, and
* we don't want to clobber that.
*/
if (hide_invalid) {
int arg = (int)hide_invalid;
if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&arg) == -1)
err(EXIT_FAILURE, "iconvctl(DISCARD_ILSEQ, %d)", arg);
}
invalids = 0;
while ((inbytes = fread(inbuf, 1, INBUFSIZE, fp)) > 0) {