Avoid an unjustified "conversion error" on long strings.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ced807b5cb4cd2ad0809eceb86184d0b88165a70..38e7343dab4ac352e0e54ec8a2220248c3cee672 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * msgl-iconv.c (iconv_string): Don't return -1 just because the string
+       is longer than 4 KB.
+       Reported by Denis Barbier <barbier@linuxfr.org>.
+
 2003-05-04  Bruno Haible  <bruno@clisp.org>
 
        * po-lex.h (po_gram_error): Don't use ISO C 99 feature on DEC C.

diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 1bebd615733f7e1b5d06a05d68700761b9127e5f..e32c6bf2edbd64e887d51c2da4a209043decf0c4 100644 (file)
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -84,7 +84,9 @@ iconv_string (iconv_t cd, const char *start, const char *end,
 
        if (res == (size_t)(-1))
          {
-           if (errno == EINVAL)
+           if (errno == E2BIG)
+             ;
+           else if (errno == EINVAL)
              break;
            else
              return -1;