From nobody Sun Sep 18 06:27:15 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MVdBq5hsWz4c3BW; Sun, 18 Sep 2022 06:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MVdBq4yVgz3YmT; Sun, 18 Sep 2022 06:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9WfLXy9Wcz/QhV0ZTmiTdEdKYXyzI3uV01fJQ/Ebu8=; b=oGVoJUaiMLvusr4iq7/gqs9IpUF4tY5aG+e3/fvfvlcfm9AX+JK7161AXHbUXPGcqT2stH i6k8tsDO5FGCay1zWGMS2m9i1bs/Z/NswqTSkvhBgpdcjYmDGGI/tjNqu/QBfM2ydUlJEn 1UFvpAkktfhGyRT4t0tzw6zEclPOzWjdYWp4ZpKzrpFzQdroasCK+l9Bl2XoudaApLMqPZ vueWnLuWTe7xyV0VmPoT+47t9EICutYf/F/zGG4xB2BN6FRAgXNjBy0fapJJM1GGtA/teF GrE8eSQWdSIzzANMP2CNAuD0Ktz/l2iPKo2lA23OkOP1otr0RuJKH/LaCPMZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MVdBq43YfzxWH; Sun, 18 Sep 2022 06:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28I6RF2u068214; Sun, 18 Sep 2022 06:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28I6RF2R068213; Sun, 18 Sep 2022 06:27:15 GMT (envelope-from git) Date: Sun, 18 Sep 2022 06:27:15 GMT Message-Id: <202209180627.28I6RF2R068213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 42b5d30b9dfe - stable/12 - iconv: only conditionally use ICONV_SET_DISCARD_ILSEQ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 42b5d30b9dfe090435acb878cf500f0fa306a197 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9WfLXy9Wcz/QhV0ZTmiTdEdKYXyzI3uV01fJQ/Ebu8=; b=IkT6ccYsNIRYPxe8MH5jCImlrSUNee3mB2Tx/zRWWBw0cljstiu46tfUYj/QRJAmNgXxRA t6FfsGgfi5XVng+8HvV233wj50vE7dOr1DYBVwWAaaqPKTyjgDuNVqFAf5XKOilIP2N3fE Yeo8yqerYch44Ynz92X3hvtF++K/1Tp1McCb3Jz0jqKMF5Gh2Pf+9EFj2r3GvqEamQWjBI FtQulChYf6Gnc5oiZWrctk21uHYVGr0FCD5lnkkj4rVSnn3nqg668VH7G/GWeFMT2pUHo5 nGJvndSPHMfEZohyEfPJ4YvIdRswyFWrtZtBOK37xOsYNCAHTKmV07XLHHx0aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663482435; a=rsa-sha256; cv=none; b=VUQRa44bNJECVE2EY1f90rjveWs1qu91DElHpJNwladHKGzeezeCnfWt+EFc0WUVo1o3Ot p1ea+7jl5uJ0HcNtp7VjK8KpQ0zTv/x3p3OwFPo+syd6glhnoI5nCfRbHfvIc6Ey0lKYlU yB6MN9Mr3lEUC9hGD/oViupyYY9QVyeroElT0Qir75HeRbL3EvRS7thZpao1BTvrjbPWbh pzbJUNFfX3kp6dkmYRlHru487hGYKtADHMqVJo1wrNSBIjkhNtrAxshR9lKl0WQ97HsFB4 iL2beL+/jOH+m8U//Nr92LXJPEoqQYqCMHAFz/vFvaoiS0YLe6+30ZmpLKWQjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=42b5d30b9dfe090435acb878cf500f0fa306a197 commit 42b5d30b9dfe090435acb878cf500f0fa306a197 Author: Kyle Evans AuthorDate: 2022-02-22 05:05:28 +0000 Commit: Kyle Evans CommitDate: 2022-09-17 19:30:09 +0000 iconv: only conditionally use ICONV_SET_DISCARD_ILSEQ 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. (cherry picked from commit ea0f37dec65daf2b7e05712738cd1720aae129eb) --- usr.bin/iconv/iconv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c index 7e911b4432e5..ba099f8af520 100644 --- a/usr.bin/iconv/iconv.c +++ b/usr.bin/iconv/iconv.c @@ -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) {