commit fc72b6d7d818ab2868920af956d1542d03342a4d Author: Andreas Schwab 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