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.

(cherry picked from commit fc72b6d7d818ab2868920af956d1542d03342a4d)

diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index bee898c63c603da6132a50f30e34b87a32e1fc29..cf32cf9b44b208e2df0bec30bf0edd4941dfa657 100644 (file)
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -187,7 +187,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