rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Restore iconv tool verbosity for unrecognized encoding names (RHEL-1018)

Browse Source 
Resolves: RHEL-1018
This commit is contained in:
Frédéric Bérat 2026-02-23 14:17:12 +01:00
parent 3b96603253
commit a5df4f06f7
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glibc-RHEL-1018.patch Normal file
View File

@ -0,0 +1,24 @@
commit fc72b6d7d818ab2868920af956d1542d03342a4d
Author: Andreas Schwab <schwab@suse.de>
Date: Tue Aug 1 17:01:37 2023 +0200
iconv: restore verbosity with unrecognized encoding names (bug 30694)
Commit 91927b7c76 ("Rewrite iconv option parsing [BZ #19519]") changed the
iconv program to call __gconv_open directly instead of the iconv_open
wrapper, but the former does not set errno. Update the caller to
interpret the return codes like iconv_open does.
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 08ea99d6adf6ea86..f199db6020284ad1 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -201,7 +201,7 @@ main (int argc, char *argv[])
if (res != __GCONV_OK)
{
- if (errno == EINVAL)
+ if (res == __GCONV_NOCONV || res == __GCONV_NODB)
{
/* Try to be nice with the user and tell her which of the
two encoding names is wrong. This is possible because