Fix a bad bug with long strings.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 7251b213dd5f64b4de8f96ec3a378f932705bcf2..58cf2ef95ddc2a0df8cbcdcfb183c81b0dbe3f10 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * linebreak.c (iconv_string_length): Don't return -1 just because the
+       string is longer than 4 KB.
+
 2003-05-09  Bruno Haible  <bruno@clisp.org>
 
        * error.c: Update from gnulib with modifications.

diff --git a/gettext-tools/lib/linebreak.c b/gettext-tools/lib/linebreak.c
index ec1d23fa2df576674be8d6c4d2bc7f67776b9a1c..a541a77351137f1223c8296fffdae4905abc0570 100644 (file)
--- a/gettext-tools/lib/linebreak.c
+++ b/gettext-tools/lib/linebreak.c
@@ -1391,7 +1391,7 @@ iconv_string_length (iconv_t cd, const char *s, size_t n)
       char *outptr = tmpbuf;
       size_t outsize = TMPBUFSIZE;
       size_t res = iconv (cd, (ICONV_CONST char **) &inptr, &insize, &outptr, &outsize);
-      if (res == (size_t)(-1))
+      if (res == (size_t)(-1) && errno != E2BIG)
         return (size_t)(-1);
       count += outptr - tmpbuf;
     }